From 2e720148f34277dd4fdff33908638a46ab23ebe2 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Wed, 4 Aug 2021 09:19:13 -0400
Subject: [PATCH] Update device entry intent on keyguard vis change

So that the device doesn't unintentionally bypass
from a stale deviceEntryIntent=true.

Test: manual
 1. Enroll udfps
 2. Auth with fp on LS
 3. Enroll face w/o bypass
 4. Auth with face on LS
 Expected: no bypass
Fixes: 194921838
Change-Id: Ief2eb3c6f6883f467252ebf9785fcc95565b7cc3
---
 .../src/com/android/keyguard/KeyguardUpdateMonitor.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 23d6ebc46030f..9bfbe325fc034 100644
--- 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) {