Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50cbee09 authored by Santos Cordon's avatar Santos Cordon Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: I1f9012d337e0dbe2f9d8c8aea307e84cb945ac5b
parents 4219c0a9 74006365

services/core/java/com/android/server/display/DisplayPowerController.java

+5 −5
Original line number Diff line number Diff line
@@ -1052,11 +1052,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }

        assert(state != Display.STATE_UNKNOWN);



        // Initialize things the first time the power state is changed.

        if (mustInitialize) {

            initialize(state);

        }



        // Apply the proximity sensor.

        if (mProximitySensor != null) {

            if (mPowerRequest.useProximitySensor && state != Display.STATE_OFF) {
@@ -1107,6 +1102,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            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.

        // The transition may be deferred, so after this point we will use the

        // actual state instead of the desired one.