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

Commit 1beb9297 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 am: d35c9183 

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



Change-Id: I20efb8766c5b694bd760db31478a3329765860f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a6b47948 d35c9183

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

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



                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) {