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

Commit 666f139f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "AOD: Don't use DOZE screen state on AOD2"

parents 7dda2cb6 2324d857

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

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class DozeMachine { 
                case DOZE_AOD_PAUSED:

                    return Display.STATE_OFF;

                case DOZE_PULSING:

                    return Display.STATE_DOZE;

                    return Display.STATE_ON;

                case DOZE_AOD:

                    return Display.STATE_DOZE_SUSPEND;

                default:

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

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ public class DozeService extends DreamService implements DozeMachine.Service { 
        super.onDreamingStarted();

        mDozeMachine.requestState(DozeMachine.State.INITIALIZED);

        startDozing();

        setDozeScreenBrightness(getResources().getInteger(

                com.android.internal.R.integer.config_screenBrightnessDoze));

    }



    @Override

packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ public class DozeMachineTest { 
        mMachine.requestState(DOZE_REQUEST_PULSE);

        mMachine.requestState(DOZE_PULSING);



        assertEquals(Display.STATE_DOZE, mServiceFake.screenState);

        assertEquals(Display.STATE_ON, mServiceFake.screenState);

    }



    @Test