commit afe4e0d7558cbf8c9a84798ce7c5fed4afd1ed86
author Louis Chang <louischang@google.com> Fri Jul 03 14:57:36 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 03 14:57:36 2020 +0000
tree 760d0ab6061fc8ee2134c2276256dae641c839ea
parent 49a272a506e346b1f4a81362ea40e39c435ecdf7
parent 9e8c7bd6454ed8af48cb108088e4d56fb13e5000

Merge "Do not count AOD showing changes as keyguard's" into rvc-dev am: 9e8c7bd645

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

Change-Id: Ib81d445b73764202b73f6dab28969fcb058ac2ef

services/core/java/com/android/server/wm/KeyguardController.java

diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 4c10d581..9c535e4 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 @@
      * 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;
         }