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

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

Change-Id: Id49de0dd9e6e4711b2414a812740c5a82473c6cc

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) {