Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d789e58 authored by Matthew Xie's avatar Matthew Xie
Browse files

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
parent 4b3227de

core/java/android/server/BluetoothAdapterStateMachine.java

+1 −1
Original line number Diff line number Diff line
@@ -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;