commit 59d33dbd25d8ca968e03bdeefedea9b0fe2e01f3
author PauloftheWest <paulofthewest@google.com> Wed Oct 01 21:07:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 01 21:07:56 2014 +0000
tree 63b96a213cdd2a931068944905aa7039bf537121
parent 7a4d229d2dd958fe033c739785eae6728caa5184
parent 797fc45ff65eccb6f967e93de913622c5225fb95

Merge "Fixed a Setting Bluetooth Airplane mode bug." into lmp-dev

src/com/android/settings/bluetooth/BluetoothEnabler.java

diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 45f3d06..b006c65 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -90,12 +90,10 @@
     }
 
     public void setupSwitchBar() {
-        mSwitchBar.addOnSwitchChangeListener(this);
         mSwitchBar.show();
     }
 
     public void teardownSwitchBar() {
-        mSwitchBar.removeOnSwitchChangeListener(this);
         mSwitchBar.hide();
     }
 
@@ -112,6 +110,7 @@
         // Bluetooth state is not sticky, so set it manually
         handleStateChanged(mLocalAdapter.getBluetoothState());
 
+        mSwitchBar.addOnSwitchChangeListener(this);
         mContext.registerReceiver(mReceiver, mIntentFilter);
         mValidListener = true;
     }
@@ -121,6 +120,7 @@
             return;
         }
 
+        mSwitchBar.removeOnSwitchChangeListener(this);
         mContext.unregisterReceiver(mReceiver);
         mValidListener = false;
     }