Bug 1042513 - Clearing timer in Firefly shutdown is racy and not needed r=blassey a=sylvestre
authorMark Finkle <mfinkle@mozilla.com>
Wed, 23 Jul 2014 19:45:43 -0400
changeset 217265 8c70620fe68ba327a33ac4fec4a7d17a187b1fe1
parent 217264 a439e9a51f95ec2d8abc8eae624d0bec9ecfdd86
child 217266 7fc1cdf6978ea065ac11406e05f00b48326cf678
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersblassey, sylvestre
bugs1042513
milestone33.0a2
Bug 1042513 - Clearing timer in Firefly shutdown is racy and not needed r=blassey a=sylvestre
mobile/android/modules/FireflyApp.jsm
--- a/mobile/android/modules/FireflyApp.jsm
+++ b/mobile/android/modules/FireflyApp.jsm
@@ -226,17 +226,17 @@ FireflyApp.prototype = {
     this._mediaListener = listener;
     func(this);
     if (listener) {
       listener.onRemoteMediaStart(this);
     }
   },
 
   _handle_meta_response: function(data) {
-    switch(data.cmd) {
+    switch (data.cmd) {
       case "create-session":
       case "~create-session":
         // if we get a response form start-app, assume we have a connection already
       case "start-app":
       case "~start-app":
         this._have_session = (data.status == "OK");
         break;
       case "end-session":
@@ -298,21 +298,16 @@ FireflyApp.prototype = {
     this._send_ramp_cmd(RAMP_CMD_PLAY, RAMP_CMD_ID_PLAY, null);
   },
 
   pause: function() {
     this._send_ramp_cmd(RAMP_CMD_PAUSE, RAMP_CMD_ID_PAUSE, null);
   },
 
   shutdown: function() {
-    if (this._info_timer) {
-      this._info_timer.clear();
-      this._info_timer = null;
-    }
-
     this.stop(function() {
       this._send_meta_cmd(PROTO_CMD_VALUE_END_SESSION);
       if (this._mediaListener) {
         this._mediaListener.onRemoteMediaStop(this);
       }
     }.bind(this));
   }
 };