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

Commit 8846d6a0 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 am: cd34b85c 

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



Change-Id: I0a6d3c868dbeb997b6d1ffef72c80a420a1e64e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27fb2341 cd34b85c

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

+2 −1
Original line number Diff line number Diff line
@@ -2704,7 +2704,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()) {