Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d69c3675: Merge "Always move Bluetooth Adapter to cold state when turn off Bluetooth." into jb-dev

Browse Source 
* commit 'd69c367577440be968d33f6ab67bc758c379156f':
  Always move Bluetooth Adapter to cold state when turn off Bluetooth.
This commit is contained in:
Matthew Xie
2012-05-02 16:23:46 -07:00
committed by Android Git Automerger
parent df363bee7d d69c367577
commit cdffda286b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,9 +441,10 @@ final class BluetoothAdapterStateMachine extends StateMachine {
if (mPublicState == BluetoothAdapter.STATE_TURNING_OFF) { if (mPublicState == BluetoothAdapter.STATE_TURNING_OFF) {
transitionTo(mHotOff); transitionTo(mHotOff);
finishSwitchingOff(); finishSwitchingOff();
if (!mContext.getResources().getBoolean deferMessage(obtainMessage(TURN_COLD));
(com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) { if (mContext.getResources().getBoolean
deferMessage(obtainMessage(TURN_COLD)); (com.android.internal.R.bool.config_bluetooth_adapter_quick_switch)) {
deferMessage(obtainMessage(TURN_HOT));
} }
} }
} else { } else {
@@ -612,9 +613,10 @@ final class BluetoothAdapterStateMachine extends StateMachine {
removeMessages(POWER_DOWN_TIMEOUT); removeMessages(POWER_DOWN_TIMEOUT);
if (!((Boolean) message.obj)) { if (!((Boolean) message.obj)) {
transitionTo(mHotOff); transitionTo(mHotOff);
if (!mContext.getResources().getBoolean 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)) {
deferMessage(obtainMessage(TURN_COLD)); deferMessage(obtainMessage(TURN_HOT));
} }
} else { } else {
if (!isTurningOn) { if (!isTurningOn) {