From f3171fb60c840a9bc0220fad651338346dddfff7 Mon Sep 17 00:00:00 2001 From: Matthew Xie Date: Wed, 11 Jan 2012 14:46:13 -0800 Subject: Set Bluetooth adapter to PowerOff mode when turnoff with airplane on Currently, when airplane mode was on and BT was on, turning BT off moved BT to hotoff state. This fix moves BT all the way to Poweroff state to have better power performance. bug 5854282 Change-Id: I7ba41797a46a81ddb3a576453f2a8303b5eed525 --- core/java/android/server/BluetoothAdapterStateMachine.java | 2 +- 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 8ec79e210eb6..f617d9566aee 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 94fbbc8d33e2..fecc8f9b3163 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; } -- cgit v1.2.3-59-g8ed1b