diff options
| author | 2023-06-13 13:53:06 +0000 | |
|---|---|---|
| committer | 2023-06-13 13:53:06 +0000 | |
| commit | 1e005849fb134f5d75ebdb0977b17b8328240ea0 (patch) | |
| tree | 3caf193f0df1e955aee31e13b7e6bcecf28949e1 | |
| parent | 324c572d3ca732ddddc88d5dc5c57a5daebd4aeb (diff) | |
| parent | 5a81f2fe1bf9405d1b5e903e3f00563c1801b642 (diff) | |
Merge "Fix ScreenOffBrightnessControllerTest" into udc-dev am: 819dfe9df5 am: 5a81f2fe1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23638652
Change-Id: I2248ef167ed952b52678813d10ee4591268cf0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java index efd82fa1136d..4f98dca660df 100644 --- a/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java +++ b/services/tests/mockingservicestests/src/com/android/server/display/DisplayPowerController2Test.java @@ -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 |