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

Commit fc534e4f authored by Josh Tsuji's avatar Josh Tsuji
Browse files

[DO NOT MERGE] Fix DozeScreenBrightnessTest. 

This was broken by ag/15974634, but the presubmits did not catch that for some reason. That CL changed the brightness logic to be <= the dim value, so this failure (and fix) make sense.

Test: atest SystemUITests, since apparently treehugger won't do that and will +2 this anyway
Fixes: 202212576
Change-Id: Ibe18322fbe1e1fbae86c5274615ad0b6f727c8e2
(cherry picked from commit 20d85a91)
parent 705aff35

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

+5 −2
Original line number Diff line number Diff line
@@ -319,13 +319,14 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(true);

        when(mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()).thenReturn(true);



        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);

        mScreen.transitionTo(INITIALIZED, DOZE);



        // If we're dozing after a timeout, and playing the unlocked screen animation, we should

        // stay at dim brightness, because the screen dims just before timeout.

        assertEquals(mServiceFake.screenBrightness, DIM_BRIGHTNESS);

        // stay at or below dim brightness, because the screen dims just before timeout.

        assertTrue(mServiceFake.screenBrightness <= DIM_BRIGHTNESS);

    }



    @Test
@@ -333,6 +334,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_POWER_BUTTON);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(true);

        when(mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()).thenReturn(true);



        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);

        mScreen.transitionTo(INITIALIZED, DOZE);
@@ -347,6 +349,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase { 
        when(mWakefulnessLifecycle.getLastSleepReason()).thenReturn(

                PowerManager.GO_TO_SLEEP_REASON_TIMEOUT);

        when(mDozeParameters.shouldControlUnlockedScreenOff()).thenReturn(false);

        when(mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()).thenReturn(false);



        mScreen.transitionTo(UNINITIALIZED, INITIALIZED);

        mScreen.transitionTo(INITIALIZED, DOZE);