Merge "Enable color fade in DPC tests" into main
diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java
index dca69eb..8b54d6d2 100644
--- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java
+++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerController2Test.java
@@ -38,6 +38,7 @@
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;
@@ -158,6 +159,7 @@
.setStrictness(Strictness.LENIENT)
.spyStatic(SystemProperties.class)
.spyStatic(BatteryStatsService.class)
+ .spyStatic(ActivityManager.class)
.build();
@Rule
@@ -182,9 +184,14 @@
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);
diff --git a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
index edaa1d5..37ee23f 100644
--- a/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
+++ b/services/tests/displayservicetests/src/com/android/server/display/DisplayPowerControllerTest.java
@@ -38,6 +38,7 @@
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;
@@ -158,6 +159,7 @@
.setStrictness(Strictness.LENIENT)
.spyStatic(SystemProperties.class)
.spyStatic(BatteryStatsService.class)
+ .spyStatic(ActivityManager.class)
.build();
@Rule
@@ -186,9 +188,14 @@
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);