diff options
| -rw-r--r-- | services/core/java/com/android/server/wm/KeyguardController.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index 4c10d5819c10..9c535e4a41d7 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -133,10 +133,11 @@ class KeyguardController { * Update the Keyguard showing state. */ void setKeyguardShown(boolean keyguardShowing, boolean aodShowing) { - // If keyguard is going away, but SystemUI aborted the transition, need to reset state. - final boolean keyguardChanged = keyguardShowing != mKeyguardShowing - || mKeyguardGoingAway && keyguardShowing; final boolean aodChanged = aodShowing != mAodShowing; + // If keyguard is going away, but SystemUI aborted the transition, need to reset state. + // Do not reset keyguardChanged status if this is aodChanged. + final boolean keyguardChanged = (keyguardShowing != mKeyguardShowing) + || (mKeyguardGoingAway && keyguardShowing && !aodChanged); if (!keyguardChanged && !aodChanged) { return; } |