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

Commit 25d87c9b authored by Piotr Wilczyński's avatar Piotr Wilczyński
Browse files

Enable color fade in DPC tests 

Bug: 294107062
Test: atest DisplayPowerControllerTest
Test: atest DisplayPowerController2Test
Change-Id: I0e7d625771a29eed609967729f60a083328448a7
parent f8e61cf3

services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.times;

import static org.mockito.Mockito.when;



import android.app.ActivityManager;

import android.content.Context;

import android.content.res.Resources;

import android.hardware.Sensor;
@@ -143,6 +144,7 @@ public final class DisplayPowerController2Test { 
                    .setStrictness(Strictness.LENIENT)

                    .spyStatic(SystemProperties.class)

                    .spyStatic(BatteryStatsService.class)

                    .spyStatic(ActivityManager.class)

                    .build();



    @Before
@@ -164,9 +166,14 @@ public final class DisplayPowerController2Test { 


        mContext.addMockSystemService(PowerManager.class, mPowerManagerMock);



        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_displayColorFadeDisabled, false);



        doAnswer((Answer<Void>) invocationOnMock -> null).when(() ->

                SystemProperties.set(anyString(), any()));

        doAnswer((Answer<Void>) invocationOnMock -> null).when(BatteryStatsService::getService);

        doAnswer((Answer<Boolean>) invocationOnMock -> false)

                .when(ActivityManager::isLowRamDeviceStatic);



        setUpSensors();

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);

services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java

+7 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.times;

import static org.mockito.Mockito.when;



import android.app.ActivityManager;

import android.content.Context;

import android.content.res.Resources;

import android.hardware.Sensor;
@@ -142,6 +143,7 @@ public final class DisplayPowerControllerTest { 
                    .setStrictness(Strictness.LENIENT)

                    .spyStatic(SystemProperties.class)

                    .spyStatic(BatteryStatsService.class)

                    .spyStatic(ActivityManager.class)

                    .build();



    @Rule
@@ -167,9 +169,14 @@ public final class DisplayPowerControllerTest { 


        mContext.addMockSystemService(PowerManager.class, mPowerManagerMock);



        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_displayColorFadeDisabled, false);



        doAnswer((Answer<Void>) invocationOnMock -> null).when(() ->

                SystemProperties.set(anyString(), any()));

        doAnswer((Answer<Void>) invocationOnMock -> null).when(BatteryStatsService::getService);

        doAnswer((Answer<Boolean>) invocationOnMock -> false)

                .when(ActivityManager::isLowRamDeviceStatic);



        setUpSensors();

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);