commit 29775794d6014196063534415ad61d60e84e9c9a
author Matthew Xie <mattx@google.com> Wed Jun 27 15:47:53 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 27 15:47:53 2012 -0700
tree 9bcac5e12f2c141942fe9a845e818f81e27ac769
parent ca2c7b7d96625cf515af88ad30062405b38cb094
parent 9107e37b24171aff55b3e0e210c16839bd7ac862

Merge "Get rid of the extra bt_disable call when turning on airplane mode Get rid of enabling bt when in airplane mode." into jb-dev

core/java/android/server/BluetoothAdapterStateMachine.java

diff --git a/core/java/android/server/BluetoothAdapterStateMachine.java b/core/java/android/server/BluetoothAdapterStateMachine.java
index 2a994b2..1de1839 100644
--- a/core/java/android/server/BluetoothAdapterStateMachine.java
+++ b/core/java/android/server/BluetoothAdapterStateMachine.java
@@ -467,7 +467,8 @@
                             mBluetoothService.cleanupAfterFinishDisable();
                             deferMessage(obtainMessage(TURN_COLD));
                             if (mContext.getResources().getBoolean
-                                (com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {
+                                (com.android.internal.R.bool.config_bluetooth_adapter_quick_switch) &&
+                                !mBluetoothService.isAirplaneModeOn()) {
                                 deferMessage(obtainMessage(TURN_HOT));
                                 mDelayBroadcastStateOff = true;
                             }
@@ -564,11 +565,9 @@
                         sendMessageDelayed(TURN_OFF_TIMEOUT, TURN_OFF_TIMEOUT_TIME);
                     }
 
-                    // we turn all the way to PowerOff with AIRPLANE_MODE_ON
                     if (message.what == AIRPLANE_MODE_ON || mBluetoothService.isAirplaneModeOn()) {
                         // We inform all the per process callbacks
                         allProcessesCallback(false);
-                        deferMessage(obtainMessage(AIRPLANE_MODE_ON));
                     }
                     break;
                 case AIRPLANE_MODE_OFF:
@@ -707,8 +706,6 @@
                     mBluetoothService.switchConnectable(false);
                     sendMessageDelayed(TURN_OFF_TIMEOUT, TURN_OFF_TIMEOUT_TIME);
                     allProcessesCallback(false);
-                    // we turn all the way to PowerOff with AIRPLANE_MODE_ON
-                    deferMessage(obtainMessage(AIRPLANE_MODE_ON));
                     break;
                 case USER_TURN_OFF:
                     Log.w(TAG, "PerProcessState received: " + message.what);