Merge "Update device entry intent on keyguard vis change" into sc-dev

2021-08-05 12:24:29 +00:00
parent 62fdd7cf1b 2e720148f3
commit ce9f73cace
1 changed files with 5 additions and 0 deletions
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -2842,6 +2842,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
            mSecureCameraLaunched = false;
        }

+        if (mKeyguardBypassController != null) {
+            // LS visibility has changed, so reset deviceEntryIntent
+            mKeyguardBypassController.setUserHasDeviceEntryIntent(false);
+        }
+
        for (int i = 0; i < mCallbacks.size(); i++) {
            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
            if (cb != null) {