diff options
| author | 2023-09-29 08:37:51 +0000 | |
|---|---|---|
| committer | 2023-09-29 08:37:51 +0000 | |
| commit | 25d87c9b8956b07a6f25517a3bd64737c6c6f2ee (patch) | |
| tree | 7cd2148262d608ff1a568239a8f782b3633f1abb | |
| parent | f8e61cf3e75ae2879decb0196b1d2ad1284d241f (diff) | |
Enable color fade in DPC tests
Bug: 294107062
Test: atest DisplayPowerControllerTest
Test: atest DisplayPowerController2Test
Change-Id: I0e7d625771a29eed609967729f60a083328448a7
2 files changed, 14 insertions, 0 deletions
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 89e28cb8ab83..df404cb8168c 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.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); 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 971ece365f30..7720b6607a81 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.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); |