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

Commit 7419a58f authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Fix DPC test 

This test was failing on devices where the configuration for
config_allowAutoBrightnessWhileDozing defaulted or was set to true.

The config should be true, when allowing full automatic screen
brightness when in doze, and therefore, screenoffbrightnesssensor should
be enabled, only when this value is false, since it is used as a
fallback sensor.

The timings of the setting the return value of this testable resource
needs to come before the variable is actually set when creating the DPC,
which is why the DPC needed to be re-initialised in this test.

Bug: 275079012
Test: atest DisplayServiceTests
Change-Id: I2eee26460d11dae82994b648d30e834547e8483a
parent 2e794c17

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

+4 −2
Original line number Diff line number Diff line
@@ -756,14 +756,16 @@ public final class DisplayPowerControllerTest { 


    @Test

    public void testSetScreenOffBrightnessSensorEnabled_DisplayIsInDoze() {

        mContext.getOrCreateTestableResources().addOverride(

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

        mHolder = createDisplayPowerController(DISPLAY_ID, UNIQUE_ID);



        Settings.System.putInt(mContext.getContentResolver(),

                Settings.System.SCREEN_BRIGHTNESS_MODE,

                Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC);



        DisplayPowerRequest dpr = new DisplayPowerRequest();

        dpr.policy = DisplayPowerRequest.POLICY_DOZE;

        mContext.getOrCreateTestableResources().addOverride(

                com.android.internal.R.bool.config_allowAutoBrightnessWhileDozing, true);

        mHolder.dpc.requestPowerState(dpr, /* waitForNegativeProximity= */ false);

        advanceTime(1); // Run updatePowerState