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

Commit ca66e22c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "frameworks/base: Fix race conditions on resume/suspend using power key"

parents 90eb9e6c 226aa3b3

services/java/com/android/server/power/DisplayPowerController.java

+1 −0
Original line number Diff line number Diff line
@@ -710,6 +710,7 @@ final class DisplayPowerController { 
                    if (!mElectronBeamOffAnimator.isStarted()) {

                        if (mPowerState.getElectronBeamLevel() == 0.0f) {

                            setScreenOn(false);

                            unblockScreenOn();

                        } else if (mPowerState.prepareElectronBeam(

                                mElectronBeamFadesConfig ?

                                        ElectronBeam.MODE_FADE :