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 am: 5c8f8f29f1

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

Change-Id: Ib3e0dffce9e21fe024f7c2d31b6a39f0855992e7
This commit is contained in:
Dave Mankoff
2020-06-05 15:32:40 +00:00
committed by Automerger Merge Worker
parent dbde9ce715 5c8f8f29f1
commit 4b3a7b5bd3
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 @Override
public void onScreenState(int state) { 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)) { && (state == Display.STATE_DOZE || state == Display.STATE_DOZE_SUSPEND)) {
setLightSensorEnabled(true); setLightSensorEnabled(true);
} else { } 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() { public void testAod_usesLightSensor() {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED); mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD); mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE); mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(3); mSensor.sendSensorEvent(3);
@@ -141,7 +140,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void testPausingAod_doesNotResetBrightness() throws Exception { public void testPausingAod_doesNotResetBrightness() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED); mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD); mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE); mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(1); mSensor.sendSensorEvent(1);
@@ -210,7 +208,6 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void testNonPositiveBrightness_keepsPreviousBrightnessAndScrim() throws Exception { public void testNonPositiveBrightness_keepsPreviousBrightnessAndScrim() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED); mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD); mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE); mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(1); mSensor.sendSensorEvent(1);
@@ -224,19 +221,17 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void pausingAod_unblanksAfterSensor() { public void pausingAod_unblanksAfterSensor() {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED); mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD); mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE); mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(2); mSensor.sendSensorEvent(2);
mScreen.transitionTo(FINISH, DOZE_AOD_PAUSING); mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSING);
mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED); mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED);
mSensor.sendSensorEvent(0); mSensor.sendSensorEvent(0);
reset(mDozeHost); reset(mDozeHost);
mScreen.transitionTo(DOZE_AOD_PAUSED, DOZE_AOD); mScreen.transitionTo(DOZE_AOD_PAUSED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE); mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(2); mSensor.sendSensorEvent(2);
verify(mDozeHost).setAodDimmingScrim(eq(0f)); verify(mDozeHost).setAodDimmingScrim(eq(0f));
@@ -246,11 +241,10 @@ public class DozeScreenBrightnessTest extends SysuiTestCase {
public void pausingAod_unblanksIfSensorWasAlwaysReady() throws Exception { public void pausingAod_unblanksIfSensorWasAlwaysReady() throws Exception {
mScreen.transitionTo(UNINITIALIZED, INITIALIZED); mScreen.transitionTo(UNINITIALIZED, INITIALIZED);
mScreen.transitionTo(INITIALIZED, DOZE_AOD); mScreen.transitionTo(INITIALIZED, DOZE_AOD);
mScreen.transitionTo(DOZE_AOD, FINISH);
mScreen.onScreenState(Display.STATE_DOZE); mScreen.onScreenState(Display.STATE_DOZE);
mSensor.sendSensorEvent(2); mSensor.sendSensorEvent(2);
mScreen.transitionTo(FINISH, DOZE_AOD_PAUSING); mScreen.transitionTo(DOZE_AOD, DOZE_AOD_PAUSING);
mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED); mScreen.transitionTo(DOZE_AOD_PAUSING, DOZE_AOD_PAUSED);
reset(mDozeHost); reset(mDozeHost);