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

Commit ef3f6582 authored by Arthur Hsu's avatar Arthur Hsu Committed by android-build-merger
Browse files

Merge "Allow adapter callback to transition state machine" am: 8d4800be 

am: 10c00f6a

Change-Id: Id9060fcfa608fe5152ca2533d27d5254bf3765eb
parents 02f81c6d 10c00f6a

src/com/android/bluetooth/btservice/AdapterState.java

+2 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ final class AdapterState extends StateMachine { 
            debugLog("Current state: OFF, message: " + msg.what);



            switch (msg.what) {

                case ENABLED_READY:

                case BLE_TURN_ON:

                    notifyAdapterStateChange(BluetoothAdapter.STATE_BLE_TURNING_ON);

                    mPendingCommandState.setBleTurningOn(true);
@@ -244,6 +245,7 @@ final class AdapterState extends StateMachine { 
            debugLog("Current state: ON, message: " + msg.what);



            switch (msg.what) {

                case DISABLED:

                case BLE_TURN_OFF:

                    notifyAdapterStateChange(BluetoothAdapter.STATE_TURNING_OFF);

                    mPendingCommandState.setTurningOff(true);