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

Commit d35c9183 authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Fix AOD flicker during lockscreen transition" into udc-qpr-dev am: f65da1a3 

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



Change-Id: I58af6fbd91313cb17b09feba12bc65274c96f01c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70aa935d f65da1a3

packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfacesImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -2900,7 +2900,10 @@ public class CentralSurfacesImpl implements CoreStartable, CentralSurfaces { 


                updateVisibleToUser();

                updateIsKeyguard();

                // TODO(b/301913237): can't delay transition if config_displayBlanksAfterDoze=true,

                // otherwise, the clock will flicker during LOCKSCREEN_TRANSITION_FROM_AOD

                mShouldDelayLockscreenTransitionFromAod = mDozeParameters.getAlwaysOn()

                        && !mDozeParameters.getDisplayNeedsBlanking()

                        && mFeatureFlags.isEnabled(

                                Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD);

                if (!mShouldDelayLockscreenTransitionFromAod) {