Bug 1306397 - Remove B2G event 'network-active-changed' and consumers from non-B2G/Gonk files: dom/presentation. r?schien draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 29 Sep 2016 19:53:44 +0200
changeset 419099 2eb15fe1e3970a459f9e7b58a5cc9ebffeb24986
parent 419098 6764d17c671a8d5c1979bad036320d288261e250
child 419100 9e5e41423ffba1a2872ba5c678db09902c0232fe
push id30846
push userarchaeopteryx@coole-files.de
push dateThu, 29 Sep 2016 17:54:44 +0000
reviewersschien
bugs1306397
milestone52.0a1
Bug 1306397 - Remove B2G event 'network-active-changed' and consumers from non-B2G/Gonk files: dom/presentation. r?schien MozReview-Commit-ID: 1tTdMntEo54
dom/presentation/provider/PresentationControlService.js
--- a/dom/presentation/provider/PresentationControlService.js
+++ b/dom/presentation/provider/PresentationControlService.js
@@ -113,18 +113,16 @@ PresentationControlService.prototype = {
       throw Cr.NS_ERROR_FAILURE;
     }
 
     this._port = this._serverSocket.port;
 
     DEBUG && log("PresentationControlService - service start on port: " + this._port); // jshint ignore:line
 
     // Monitor network interface change to restart server socket.
-    // Only B2G has nsINetworkManager
-    Services.obs.addObserver(this, "network-active-changed", false);
     Services.obs.addObserver(this, "network:offline-status-changed", false);
 
     this._notifyServerReady();
   },
 
   _notifyServerReady: function() {
     Services.tm.mainThread.dispatch(() => {
       if (this._listener) {
@@ -319,43 +317,27 @@ PresentationControlService.prototype = {
 
   close: function() {
     DEBUG && log("PresentationControlService - close"); // jshint ignore:line
     if (this._isServiceInit()) {
       DEBUG && log("PresentationControlService - close server socket"); // jshint ignore:line
       this._serverSocket.close();
       this._serverSocket = null;
 
-      Services.obs.removeObserver(this, "network-active-changed");
       Services.obs.removeObserver(this, "network:offline-status-changed");
 
       this._notifyServerStopped(Cr.NS_OK);
     }
     this._port = 0;
   },
 
   // nsIObserver
   observe: function(aSubject, aTopic, aData) {
     DEBUG && log("PresentationControlService - observe: " + aTopic); // jshint ignore:line
     switch (aTopic) {
-      case "network-active-changed": {
-        if (!aSubject) {
-          DEBUG && log("No active network"); // jshint ignore:line
-          return;
-        }
-
-        /**
-         * Restart service only when original status is online because other
-         * cases will be handled by "network:offline-status-changed".
-         */
-        if (!Services.io.offline) {
-          this._restartServer();
-        }
-        break;
-      }
       case "network:offline-status-changed": {
         if (aData == "offline") {
           DEBUG && log("network offline"); // jshint ignore:line
           return;
         }
         this._restartServer();
         break;
       }