Merge pull request #27671 from gasolin/issue-1125735

Bug 1125735 - [Bluetooth][System]remove updateConnected function since its not used...; r=ian,alive
mozilla-b2g · Jan 28, 2015 · 26ff171 · 26ff171
2 parents e46c388 + d7a5a09
commit 26ff171
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 32 deletions.
diff --git a/apps/system/js/bluetooth.js b/apps/system/js/bluetooth.js
@@ -117,7 +117,6 @@ var Bluetooth = {
     navigator.mozSetMessageHandler('bluetooth-opp-transfer-start',
       function bt_fileTransferUpdate(transferInfo) {
         self._setProfileConnected(self.Profiles.OPP, true);
-        self.updateConnected();
         var evt = document.createEvent('CustomEvent');
         evt.initCustomEvent('bluetooth-opp-transfer-start',
           /* canBubble */ true, /* cancelable */ false,
@@ -129,7 +128,6 @@ var Bluetooth = {
     navigator.mozSetMessageHandler('bluetooth-opp-transfer-complete',
       function bt_fileTransferUpdate(transferInfo) {
         self._setProfileConnected(self.Profiles.OPP, false);
-        self.updateConnected();
         var evt = document.createEvent('CustomEvent');
         evt.initCustomEvent('bluetooth-opp-transfer-complete',
           /* canBubble */ true, /* cancelable */ false,
@@ -190,40 +188,17 @@ var Bluetooth = {
     var self = this;
     adapter.onhfpstatuschanged = function bt_hfpStatusChanged(evt) {
       self._setProfileConnected(self.Profiles.HFP, evt.status);
-      self.updateConnected();
     };
 
     adapter.ona2dpstatuschanged = function bt_a2dpStatusChanged(evt) {
       self._setProfileConnected(self.Profiles.A2DP, evt.status);
-      self.updateConnected();
     };
 
     adapter.onscostatuschanged = function bt_scoStatusChanged(evt) {
       self._setProfileConnected(self.Profiles.SCO, evt.status);
     };
   },
 
-  updateConnected: function bt_updateConnected() {
-    var bluetooth = window.navigator.mozBluetooth;
-
-    if (!bluetooth || !('isConnected' in bluetooth)) {
-      return;
-    }
-
-    var wasConnected = this.connected;
-    this.connected = this.isProfileConnected(this.Profiles.HFP) ||
-                     this.isProfileConnected(this.Profiles.A2DP) ||
-                     this.isProfileConnected(this.Profiles.OPP);
-
-    if (wasConnected !== this.connected) {
-      var evt = document.createEvent('CustomEvent');
-      evt.initCustomEvent('bluetoothconnectionchange',
-        /* canBubble */ true, /* cancelable */ false,
-        {deviceConnected: this.connected});
-      window.dispatchEvent(evt);
-    }
-  },
-
   /**
    * called by external for re-use adapter.
    *

diff --git a/apps/system/js/statusbar.js b/apps/system/js/statusbar.js
@@ -275,11 +275,8 @@ var StatusBar = {
     // Listen to Custom event send by 'nfc_manager.js'
     window.addEventListener('nfc-state-changed', this);
 
-    // 'bluetoothconnectionchange' fires when the overall bluetooth connection
-    //  changes.
     // 'bluetoothprofileconnectionchange' fires when a bluetooth connection of
     //  a specific profile changes.
-    window.addEventListener('bluetoothconnectionchange', this);
     window.addEventListener('bluetoothprofileconnectionchange', this);
 
     // Listen to 'moztimechange'
@@ -433,10 +430,6 @@ var StatusBar = {
         this.update.data.call(this);
         break;
 
-      case 'bluetoothconnectionchange':
-        this.update.bluetooth.call(this);
-        break;
-
       case 'bluetoothprofileconnectionchange':
         this.update.bluetoothProfiles.call(this);
         break;