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

Commit 20b353ae authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

Fix PMSTest for power group doze/sleep. 

When the new flag is enabled, all non-default groups go to sleep
instead of doze

ag/33544793 didn't address all test cases.

Fix: 418125303
Test: atest PowerManagerServiceTest
Flag: android.companion.virtualdevice.flags.virtual_power_group_sleep_no_doze
Change-Id: Ia3952aff398dcd7d66f48c1f205657923f59120f
parent 1b5e25d3

services/tests/powerservicetests/src/com/android/server/power/PowerManagerServiceTest.java

+13 −2
Original line number Diff line number Diff line
@@ -2131,11 +2131,17 @@ public class PowerManagerServiceTest { 
                WAKEFULNESS_AWAKE);



        advanceTime(15000);



        int expectedNonDefaultGroupWakefullness =

                android.companion.virtualdevice.flags.Flags.virtualPowerGroupSleepNoDoze()

                        ? WAKEFULNESS_ASLEEP

                        : WAKEFULNESS_DOZING;



        assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_AWAKE);

        assertThat(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP)).isEqualTo(

                WAKEFULNESS_AWAKE);

        assertThat(mService.getWakefulnessLocked(nonDefaultDisplayGroupId)).isEqualTo(

                WAKEFULNESS_DOZING);

                expectedNonDefaultGroupWakefullness);

    }



    @Test
@@ -2764,11 +2770,16 @@ public class PowerManagerServiceTest { 


        advanceTime(15000);



        int expectedNonDefaultGroupWakefullness =

                android.companion.virtualdevice.flags.Flags.virtualPowerGroupSleepNoDoze()

                        ? WAKEFULNESS_ASLEEP

                        : WAKEFULNESS_DOZING;



        // Only the default display group is dreaming.

        assertThat(mService.getWakefulnessLocked(Display.DEFAULT_DISPLAY_GROUP)).isEqualTo(

                WAKEFULNESS_DREAMING);

        assertThat(mService.getWakefulnessLocked(nonDefaultDisplayGroupId)).isEqualTo(

                WAKEFULNESS_DOZING);

                expectedNonDefaultGroupWakefullness);

        assertThat(mService.getGlobalWakefulnessLocked()).isEqualTo(WAKEFULNESS_DREAMING);

    }