Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't reset brightness when going into AOD_PAUSED" into tm-dev am: d248c68122

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

Change-Id: I9f490b30ec29b3d11a406bee020852fa080d7259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-18 20:05:15 +00:00
committed by Automerger Merge Worker
parent 7f327370a1 d248c68122
commit c50048f40e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/doze/DozeScreenBrightness.java
View File

@@ -147,10 +147,12 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
setLightSensorEnabled(true); setLightSensorEnabled(true);
break; break;
case DOZE: case DOZE:
case DOZE_AOD_PAUSED:
setLightSensorEnabled(false); setLightSensorEnabled(false);
resetBrightnessToDefault(); resetBrightnessToDefault();
break; break;
case DOZE_AOD_PAUSED:
setLightSensorEnabled(false);
break;
case FINISH: case FINISH:
onDestroy(); onDestroy();
break; break;

5
packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java
View File

@@ -506,7 +506,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
} }
@Test @Test
public void transitionToAodPaused_resetsToDefaultBrightness_lightSensorDisabled() { public void transitionToAodPaused_lightSensorDisabled() {
// GIVEN AOD // GIVEN AOD
mScreen.transitionTo(UNINITIALIZED, INITIALIZED); mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD); mScreen.transitionTo(INITIALIZED, DOZE_AOD);
@@ -516,9 +516,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSED); mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSED);
waitForSensorManager(); waitForSensorManager();
// THEN brightness is reset and light sensor is unregistered
assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS);
// THEN new light events don't update brightness since the light sensor was unregistered // THEN new light events don't update brightness since the light sensor was unregistered
mSensor.sendSensorEvent(1); mSensor.sendSensorEvent(1);
assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS); assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS);