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

Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

Browse Source
This commit is contained in:
Matthew Xie
2011-12-12 12:07:39 -08:00
committed by Android (Google) Code Review
parent 386f208489 2d789e58a8
commit ed0830c502
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,13 +349,13 @@ final class BluetoothAdapterStateMachine extends StateMachine {
boolean retValue = HANDLED; boolean retValue = HANDLED;
switch(message.what) { switch(message.what) {
case USER_TURN_ON: case USER_TURN_ON:
broadcastState(BluetoothAdapter.STATE_TURNING_ON);
if ((Boolean) message.obj) { if ((Boolean) message.obj) {
persistSwitchSetting(true); persistSwitchSetting(true);
} }
// let it fall to TURN_ON_CONTINUE: // let it fall to TURN_ON_CONTINUE:
//$FALL-THROUGH$ //$FALL-THROUGH$
case TURN_ON_CONTINUE: case TURN_ON_CONTINUE:
broadcastState(BluetoothAdapter.STATE_TURNING_ON);
mBluetoothService.switchConnectable(true); mBluetoothService.switchConnectable(true);
transitionTo(mSwitching); transitionTo(mSwitching);
break; break;