Merge "Fix notification animation from AOD" into tm-qpr-dev

This commit is contained in:
Jordan Demeulenaere
2022-07-11 14:13:54 +00:00
committed by Android (Google) Code Review

View File

@@ -2721,7 +2721,8 @@ public class CentralSurfacesImpl extends CoreStartable implements
@Override @Override
public void dismissKeyguardThenExecute(OnDismissAction action, Runnable cancelAction, public void dismissKeyguardThenExecute(OnDismissAction action, Runnable cancelAction,
boolean afterKeyguardGone) { boolean afterKeyguardGone) {
if (mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_ASLEEP if (!action.willRunAnimationOnKeyguard()
&& mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_ASLEEP
&& mKeyguardStateController.canDismissLockScreen() && mKeyguardStateController.canDismissLockScreen()
&& !mStatusBarStateController.leaveOpenOnKeyguardHide() && !mStatusBarStateController.leaveOpenOnKeyguardHide()
&& mDozeServiceHost.isPulsing()) { && mDozeServiceHost.isPulsing()) {