diff options
| author | Matthew Xie <mattx@google.com> | 2011-12-12 12:09:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 12:09:13 -0800 |
| commit | 18ad6514bbeb68a96c12ba1636ab8df8e3945f37 (patch) | |
| tree | bc9ed8368a8843791d8b14d52dec43476d53e91c /core/java/android | |
| parent | f3ea02319fc8d1f882ef7f392c245e197ab858de (diff) | |
| parent | ed0830c502d7403d69abfd8247c046ac2746ac8c (diff) | |
| download | frameworks_base-18ad6514bbeb68a96c12ba1636ab8df8e3945f37.zip frameworks_base-18ad6514bbeb68a96c12ba1636ab8df8e3945f37.tar.gz frameworks_base-18ad6514bbeb68a96c12ba1636ab8df8e3945f37.tar.bz2 | |
am ed0830c5: Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1
* commit 'ed0830c502d7403d69abfd8247c046ac2746ac8c':
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/server/BluetoothAdapterStateMachine.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/server/BluetoothAdapterStateMachine.java b/core/java/android/server/BluetoothAdapterStateMachine.java index f3f4174..8ec79e2 100644 --- a/core/java/android/server/BluetoothAdapterStateMachine.java +++ b/core/java/android/server/BluetoothAdapterStateMachine.java @@ -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; |