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

Commit 36a2dba7 authored by Sal Savage's avatar Sal Savage Committed by android-build-merger
Browse files

Merge "Fix NPE in MceStateMachine when getState() is called during shut down" am: 7b28d439

am: bb5067f7

Change-Id: Ic5a8474b43451dc50e8a244634537fb9f7c6123c
parents 5454e898 bb5067f7
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ final class MceStateMachine extends StateMachine {

    public synchronized int getState() {
        IState currentState = this.getCurrentState();
        if (currentState.getClass() == Disconnected.class) {
        if (currentState == null || currentState.getClass() == Disconnected.class) {
            return BluetoothProfile.STATE_DISCONNECTED;
        }
        if (currentState.getClass() == Connected.class) {