Merge "Set Bluetooth adapter to PowerOff mode when turnoff with airplane on" into ics-mr1

Author: Matthew Xie

core/java/android/server/BluetoothAdapterStateMachine.java

@@ -528,7 +528,7 @@ public boolean processMessage(Message message) {
                     }
 
                     // we turn all the way to PowerOff with AIRPLANE_MODE_ON
-                    if (message.what == 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));

core/java/android/server/BluetoothService.java

@@ -1706,7 +1706,7 @@ private void registerForAirplaneMode(IntentFilter filter) {
     }
 
     /* Returns true if airplane mode is currently on */
-    private final boolean isAirplaneModeOn() {
+    /*package*/ final boolean isAirplaneModeOn() {
         return Settings.System.getInt(mContext.getContentResolver(),
                 Settings.System.AIRPLANE_MODE_ON, 0) == 1;
     }