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

Commit cd34b85c authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge "Fix notification animation from AOD" into tm-qpr-dev am: 8eee52bf 

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



Change-Id: I9e6e9a7275cd4608b9985b512587fd5f546b932d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 89bfaa3f 8eee52bf

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

+2 −1
Original line number Diff line number Diff line
@@ -2721,7 +2721,8 @@ public class CentralSurfacesImpl extends CoreStartable implements 
    @Override

    public void dismissKeyguardThenExecute(OnDismissAction action, Runnable cancelAction,

            boolean afterKeyguardGone) {

        if (mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_ASLEEP

        if (!action.willRunAnimationOnKeyguard()

                && mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_ASLEEP

                && mKeyguardStateController.canDismissLockScreen()

                && !mStatusBarStateController.leaveOpenOnKeyguardHide()

                && mDozeServiceHost.isPulsing()) {