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

Commit a4445503 authored by Michael Wright's avatar Michael Wright Committed by Automerger Merge Worker
Browse files

Merge "Fix ScreenOffBrightnessControllerTest" into udc-dev am: 819dfe9d am: bbd443d5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23638652



Change-Id: I645faea216461aeb250bf5040e14e190c8f8887c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d379cc5 bbd443d5

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

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


    @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