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

am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

Browse Source 
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
This commit is contained in:
Matthew Xie
2011-12-12 12:09:13 -08:00
committed by Android Git Automerger
parent f3ea02319f ed0830c502
commit 18ad6514bb
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;
switch(message.what) {
case USER_TURN_ON:
broadcastState(BluetoothAdapter.STATE_TURNING_ON);
if ((Boolean) message.obj) {
persistSwitchSetting(true);
}
// let it fall to TURN_ON_CONTINUE:
//$FALL-THROUGH$
case TURN_ON_CONTINUE:
broadcastState(BluetoothAdapter.STATE_TURNING_ON);
mBluetoothService.switchConnectable(true);
transitionTo(mSwitching);
break;