drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '79d84930cd776c7173330eeb13b3282b6034fc37':
  Set Bluetooth adapter to PowerOff mode when turnoff with airplane on
This commit is contained in:
Matthew Xie
2012-01-12 11:27:10 -08:00
committed by Android Git Automerger
parent db4296bde9 79d84930cd
commit 1890fa8220
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/server/BluetoothAdapterStateMachine.java
View File

@ -528,7 +528,7 @@ final class BluetoothAdapterStateMachine extends StateMachine {
} }
// we turn all the way to PowerOff with AIRPLANE_MODE_ON // 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 // We inform all the per process callbacks
allProcessesCallback(false); allProcessesCallback(false);
deferMessage(obtainMessage(AIRPLANE_MODE_ON)); deferMessage(obtainMessage(AIRPLANE_MODE_ON));

2
core/java/android/server/BluetoothService.java
View File

@ -1706,7 +1706,7 @@ public class BluetoothService extends IBluetooth.Stub {
} }
/* Returns true if airplane mode is currently on */ /* Returns true if airplane mode is currently on */
private final boolean isAirplaneModeOn() { /*package*/ final boolean isAirplaneModeOn() {
return Settings.System.getInt(mContext.getContentResolver(), return Settings.System.getInt(mContext.getContentResolver(),
Settings.System.AIRPLANE_MODE_ON, 0) == 1; Settings.System.AIRPLANE_MODE_ON, 0) == 1;
} }