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

Commit 5131f519 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fix illegal state in doze machine 

Test: trigger lock screen sensor
Change-Id: Id3c09fc98c3a916cb6d6535a3f7dfcf728ec3c3f
Fixes: 123715942
parent f9a25e52

packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java

+4 −5
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ public class DozeTriggers implements DozeMachine.Part { 
        boolean wakeEvent = rawValues != null && rawValues.length > 0 && rawValues[0] != 0;



        if (isWakeDisplay) {

            onWakeScreen(wakeEvent);

            onWakeScreen(wakeEvent, mMachine.getState());

        } else if (isLongPress || isWakeLockScreen) {

            requestPulse(pulseReason, sensorPerformedProxCheck);

        } else {
@@ -195,9 +195,8 @@ public class DozeTriggers implements DozeMachine.Part { 
        }

    }



    private void onWakeScreen(boolean wake) {

    private void onWakeScreen(boolean wake, DozeMachine.State state) {

        DozeLog.traceWakeDisplay(wake);

        DozeMachine.State state = mMachine.getState();

        boolean paused = (state == DozeMachine.State.DOZE_AOD_PAUSED);

        boolean pausing = (state == DozeMachine.State.DOZE_AOD_PAUSING);

        sWakeDisplaySensorState = wake;
@@ -208,7 +207,7 @@ public class DozeTriggers implements DozeMachine.Part { 
                    // In pocket, drop event.

                    return;

                }

                if (mMachine.getState() == DozeMachine.State.DOZE) {

                if (state == DozeMachine.State.DOZE) {

                    mMachine.requestState(DozeMachine.State.DOZE_AOD);

                }

            }, false /* alreadyPerformedProxCheck */, DozeLog.REASON_SENSOR_WAKE_UP);
@@ -236,7 +235,7 @@ public class DozeTriggers implements DozeMachine.Part { 
                }

                mDozeSensors.setListening(true);

                if (newState == DozeMachine.State.DOZE_AOD && !sWakeDisplaySensorState) {

                    onWakeScreen(false);

                    onWakeScreen(false, newState);

                }

                break;

            case DOZE_AOD_PAUSED: