diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/server/BluetoothAdapterStateMachine.java | 2 | ||||
| -rwxr-xr-x | core/java/android/server/BluetoothService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/server/BluetoothAdapterStateMachine.java b/core/java/android/server/BluetoothAdapterStateMachine.java index 8ec79e2..f617d95 100644 --- a/core/java/android/server/BluetoothAdapterStateMachine.java +++ b/core/java/android/server/BluetoothAdapterStateMachine.java @@ -528,7 +528,7 @@ final class BluetoothAdapterStateMachine extends StateMachine { } // 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)); diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java index 94fbbc8..fecc8f9 100755 --- a/core/java/android/server/BluetoothService.java +++ b/core/java/android/server/BluetoothService.java @@ -1706,7 +1706,7 @@ public class BluetoothService extends IBluetooth.Stub { } /* 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; } |