diff options
| author | Matthew Xie <mattx@google.com> | 2011-12-12 11:36:18 -0800 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2011-12-12 11:36:18 -0800 |
| commit | 2d789e58a8d2665b980fa952ba233cdde40f0157 (patch) | |
| tree | 742f95695b78774dbabd1521ae02af4226a832a8 /core/java/android/server/BluetoothAdapterStateMachine.java | |
| parent | 4b3227de17b6b4ee776cfb26aa33ce8ff1c195f0 (diff) | |
| download | frameworks_base-2d789e58a8d2665b980fa952ba233cdde40f0157.zip frameworks_base-2d789e58a8d2665b980fa952ba233cdde40f0157.tar.gz frameworks_base-2d789e58a8d2665b980fa952ba233cdde40f0157.tar.bz2 | |
Move broadcastState STATE_TURNING_ON before persistSwitchSetting
CTS test revealed that persistSwitchSetting could take more than 1 second.
STATE_TURNING_ON intent missed the test timing. We move the broadcast
before persistSwitchSetting
bug 5740715
Change-Id: I54a0a0afc8d1c4fc28f84e6122809af2f1456ca7
Diffstat (limited to 'core/java/android/server/BluetoothAdapterStateMachine.java')
| -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; |