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

Commit 7831be92 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Android (Google) Code Review
Browse files

Merge "Enable color fade in DPC tests" into main

parents 2cca910b 25d87c9b

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;
@@ -158,6 +159,7 @@ public final class DisplayPowerController2Test { 
                    .setStrictness(Strictness.LENIENT)

                    .spyStatic(SystemProperties.class)

                    .spyStatic(BatteryStatsService.class)

                    .spyStatic(ActivityManager.class)

                    .build();



    @Rule
@@ -182,9 +184,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;
@@ -158,6 +159,7 @@ public final class DisplayPowerControllerTest { 
                    .setStrictness(Strictness.LENIENT)

                    .spyStatic(SystemProperties.class)

                    .spyStatic(BatteryStatsService.class)

                    .spyStatic(ActivityManager.class)

                    .build();



    @Rule
@@ -186,9 +188,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);