commit 470d057aedee2f1a8b88a95419f8b1bb42f2120a
author Matthew Xie <mattx@google.com> Mon Dec 12 15:39:27 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 12 15:39:27 2011 -0800
tree b1acf75706396a9bddefe4f57e392020cef7c0ca
parent 74bc6075e13f871a47622d2a08d91b259448a24e
parent 18ad6514bbeb68a96c12ba1636ab8df8e3945f37

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

* commit '18ad6514bbeb68a96c12ba1636ab8df8e3945f37':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting

core/java/android/server/BluetoothAdapterStateMachine.java

diff --git a/core/java/android/server/BluetoothAdapterStateMachine.java b/core/java/android/server/BluetoothAdapterStateMachine.java
index f4a390e..ed59b03 100644
--- a/core/java/android/server/BluetoothAdapterStateMachine.java
+++ b/core/java/android/server/BluetoothAdapterStateMachine.java
@@ -360,13 +360,13 @@
             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;