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

Commit 18ad6514 authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

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

* commit 'ed0830c5':
  Move broadcastState STATE_TURNING_ON before persistSwitchSetting
parents f3ea0231 ed0830c5

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;