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

Commit 2a917274 authored by Robert Horvath's avatar Robert Horvath Committed by Android (Google) Code Review
Browse files

Merge "PowerManagerServiceTest: Set dreams as supported & enabled by default" into main

parents 6d4f8871 1441ebb1

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

+4 −12
Original line number Diff line number Diff line
@@ -240,6 +240,10 @@ public class PowerManagerServiceTest { 
        cr.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        when(mContextSpy.getContentResolver()).thenReturn(cr);



        when(mResourcesSpy.getBoolean(com.android.internal.R.bool.config_dreamsSupported))

                .thenReturn(true);

        when(mResourcesSpy.getBoolean(com.android.internal.R.bool.config_dreamsEnabledByDefault))

                .thenReturn(true);

        Settings.Global.putInt(mContextSpy.getContentResolver(),

                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),
@@ -1084,13 +1088,9 @@ public class PowerManagerServiceTest { 
    @SuppressWarnings("GuardedBy")

    @Test

    public void testScreensaverActivateOnSleepEnabled_powered_afterTimeout_goesToDreaming() {

        when(mResourcesSpy.getBoolean(com.android.internal.R.bool.config_dreamsSupported))

                .thenReturn(true);

        when(mBatteryManagerInternalMock.isPowered(anyInt())).thenReturn(true);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ENABLED, 1);



        doAnswer(inv -> {

            when(mDreamManagerInternalMock.isDreaming()).thenReturn(true);
@@ -1112,8 +1112,6 @@ public class PowerManagerServiceTest { 
    public void testAmbientSuppression_disablesDreamingAndWakesDevice() {

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ENABLED, 1);



        setDreamsDisabledByAmbientModeSuppressionConfig(true);

        setMinimumScreenOffTimeoutConfig(10000);
@@ -1141,8 +1139,6 @@ public class PowerManagerServiceTest { 
    public void testAmbientSuppressionDisabled_shouldNotWakeDevice() {

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ENABLED, 1);



        setDreamsDisabledByAmbientModeSuppressionConfig(false);

        setMinimumScreenOffTimeoutConfig(10000);
@@ -1169,8 +1165,6 @@ public class PowerManagerServiceTest { 
    public void testAmbientSuppression_doesNotAffectDreamForcing() {

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ENABLED, 1);



        setDreamsDisabledByAmbientModeSuppressionConfig(true);

        setMinimumScreenOffTimeoutConfig(10000);
@@ -1196,8 +1190,6 @@ public class PowerManagerServiceTest { 
    public void testBatteryDrainDuringDream() {

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

        Settings.Secure.putInt(mContextSpy.getContentResolver(),

                Settings.Secure.SCREENSAVER_ENABLED, 1);



        setMinimumScreenOffTimeoutConfig(100);

        setDreamsBatteryLevelDrainConfig(5);