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

Commit ed0830c5 authored by Matthew Xie's avatar Matthew Xie Committed by Android (Google) Code Review
Browse files

Merge "Move broadcastState STATE_TURNING_ON before persistSwitchSetting" into ics-mr1

parents 386f2084 2d789e58
Loading
Loading
Loading
Loading
+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;