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

Merge "Ensure that brightness sensor is registered in AOD" into rvc-d1-dev

Browse Source
This commit is contained in:
Dave Mankoff
2020-06-05 15:18:34 +00:00
committed by Android (Google) Code Review
parent f0df75e39c b6891b38c7
commit 5c8f8f29f1
2 changed files with 5 additions and 9 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

@@ -127,7 +127,9 @@ public class DozeScreenBrightness extends BroadcastReceiver implements DozeMachi
@Override
public void onScreenState(int state) {
if (mState == DozeMachine.State.FINISH && !mScreenOff
if (!mScreenOff
&& (mState == DozeMachine.State.DOZE_AOD
|| mState == DozeMachine.State.DOZE_AOD_DOCKED)
&& (state == Display.STATE_DOZE || state == Display.STATE_DOZE_SUSPEND)) {
setLightSensorEnabled(true);
} else {

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

@@ -105,7 +105,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void testAod_usesLightSensor() {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(3);
@@ -141,7 +140,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void testPausingAod_doesNotResetBrightness() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(1);
@@ -210,7 +208,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void testNonPositiveBrightness_keepsPreviousBrightnessAndScrim() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(1);
@@ -224,19 +221,17 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void pausingAod_unblanksAfterSensor() {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(2);
mScreen.transitionTo(FINISH, DOZE_AOD_PAUSING);
mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSING);
mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED);
mSensor.sendSensorEvent(0);
reset(mDozeHost);
mScreen.transitionTo(DOZE_AOD_PAUSED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(2);
verify(mDozeHost).setAodDimmingScrim(eq(0f));
@@ -246,11 +241,10 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void pausingAod_unblanksIfSensorWasAlwaysReady() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(2);
mScreen.transitionTo(FINISH, DOZE_AOD_PAUSING);
mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSING);
mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED);
reset(mDozeHost);