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

Merge "Display's transition phase checked before DPC init." into sc-v2-dev am: 618c83b000

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

Change-Id: Ifaf0e41a063a295caad0985df2812d26551e018f
This commit is contained in:
Santos Cordon
2021-10-20 11:03:28 +00:00
committed by Automerger Merge Worker
parent dbac4fe086 618c83b000
commit 7400636564
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/display/DisplayPowerController.java
View File

@@ -1052,11 +1052,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
} }
assert(state != Display.STATE_UNKNOWN); assert(state != Display.STATE_UNKNOWN);
// Initialize things the first time the power state is changed.
if (mustInitialize) {
initialize(state);
}
// Apply the proximity sensor. // Apply the proximity sensor.
if (mProximitySensor != null) { if (mProximitySensor != null) {
if (mPowerRequest.useProximitySensor && state != Display.STATE_OFF) { if (mPowerRequest.useProximitySensor && state != Display.STATE_OFF) {
@@ -1107,6 +1102,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
state = Display.STATE_OFF; state = Display.STATE_OFF;
} }
// Initialize things the first time the power state is changed.
if (mustInitialize) {
initialize(state);
}
// Animate the screen state change unless already animating. // Animate the screen state change unless already animating.
// The transition may be deferred, so after this point we will use the // The transition may be deferred, so after this point we will use the
// actual state instead of the desired one. // actual state instead of the desired one.