Merge "Fix notification animation from AOD" into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
8eee52bf1d
@@ -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()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user