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

Don't reset brightness when going into AOD_PAUSED

Browse Source 
We don't want the brightness to change right before
the display goes off

Fixes: 228285716
Test: manually cover proximity sensor and wait
Test: atest DozeScreenBrightnessTest
for the display to turn off

Change-Id: I0980f223e7ae86afcc0d3a3a8c93e57d8883e281
This commit is contained in:
Beverly
2022-04-18 14:46:48 +00:00
parent 4a93e580d1
commit 72bdcf6eee
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);
break;
case DOZE:
case DOZE_AOD_PAUSED:
setLightSensorEnabled(false);
resetBrightnessToDefault();
break;
case DOZE_AOD_PAUSED:
setLightSensorEnabled(false);
break;
case FINISH:
onDestroy();
break;

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

@@ -506,7 +506,7 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
}
@Test
public void transitionToAodPaused_resetsToDefaultBrightness_lightSensorDisabled() {
public void transitionToAodPaused_lightSensorDisabled() {
// GIVEN AOD
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD);
@@ -516,9 +516,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSED);
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
mSensor.sendSensorEvent(1);
assertEquals(mServiceFake.screenBrightness, DEFAULT_BRIGHTNESS);