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

Commit 88663470 authored by Liana Kazanova's avatar Liana Kazanova Committed by Android (Google) Code Review
Browse files

Merge "Revert "PowerManagerServiceTest: Set dreams as supported & enabled by... 

Merge "Revert "PowerManagerServiceTest: Set dreams as supported & enabled by default"" into udc-qpr-dev
parents a12441e8 d6b379d9

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

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

        cr.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

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

        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.putInt(mContextSpy.getContentResolver(),

                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);

                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0);

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

        Settings.Secure.putInt(mContextSpy.getContentResolver(),
@@ -1080,6 +1076,8 @@ public class PowerManagerServiceTest { 
    @Test

    @Test

    public void testScreensaverActivateOnSleepEnabled_powered_afterTimeout_goesToDreaming() {

    public void testScreensaverActivateOnSleepEnabled_powered_afterTimeout_goesToDreaming() {

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

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

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

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);





        doAnswer(inv -> {

        doAnswer(inv -> {

            when(mDreamManagerInternalMock.isDreaming()).thenReturn(true);

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

    public void testAmbientSuppression_disablesDreamingAndWakesDevice() {

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

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

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

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

                Settings.Secure.SCREENSAVER_ENABLED, 1);





        setDreamsDisabledByAmbientModeSuppressionConfig(true);

        setDreamsDisabledByAmbientModeSuppressionConfig(true);

        setMinimumScreenOffTimeoutConfig(10000);

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

    public void testAmbientSuppressionDisabled_shouldNotWakeDevice() {

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

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

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

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

                Settings.Secure.SCREENSAVER_ENABLED, 1);





        setDreamsDisabledByAmbientModeSuppressionConfig(false);

        setDreamsDisabledByAmbientModeSuppressionConfig(false);

        setMinimumScreenOffTimeoutConfig(10000);

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

    public void testAmbientSuppression_doesNotAffectDreamForcing() {

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

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

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

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

                Settings.Secure.SCREENSAVER_ENABLED, 1);





        setDreamsDisabledByAmbientModeSuppressionConfig(true);

        setDreamsDisabledByAmbientModeSuppressionConfig(true);

        setMinimumScreenOffTimeoutConfig(10000);

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

    public void testBatteryDrainDuringDream() {

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

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

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 1);

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

                Settings.Secure.SCREENSAVER_ENABLED, 1);





        setMinimumScreenOffTimeoutConfig(100);

        setMinimumScreenOffTimeoutConfig(100);

        setDreamsBatteryLevelDrainConfig(5);

        setDreamsBatteryLevelDrainConfig(5);