commit d038189709427aecffb84a3e83086f09f46bc714
author Kevin Chyn <kchyn@google.com> Thu Jul 11 16:25:36 2019 -0700
committer Kevin Chyn <kchyn@google.com> Thu Jul 11 17:29:18 2019 -0700
tree 8f868118d326763e08f6f3a81bc3831f56eb9407
parent b224622c29679e83ac4b42bc7ae6553456391629

Reset mSecureCameraLaunched when bouncer is shown

Whenever the bouncer is shown, face auth should start again.

Fixes: 137228869

Test: Install test camera app that's available on lockscreen, double tap
      power to launch camera on lock screen. Bouncer is shown, and face
      unlock works

Change-Id: Ia33075935c6d8413ab7c9351739cca67bb81c377

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 05e14a7..2eb93d3 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -2203,6 +2203,15 @@
         if (DEBUG) Log.d(TAG, "handleKeyguardBouncerChanged(" + bouncer + ")");
         boolean isBouncer = (bouncer == 1);
         mBouncer = isBouncer;
+
+        if (isBouncer) {
+            // If the bouncer is shown, always clear this flag. This can happen in the following
+            // situations: 1) Default camera with SHOW_WHEN_LOCKED is not chosen yet. 2) Secure
+            // camera requests dismiss keyguard (tapping on photos for example). When these happen,
+            // face auth should resume.
+            mSecureCameraLaunched = false;
+        }
+
         for (int i = 0; i < mCallbacks.size(); i++) {
             KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
             if (cb != null) {
@@ -2649,6 +2658,7 @@
             pw.println("    strongAuthFlags=" + Integer.toHexString(strongAuthFlags));
             pw.println("    trustManaged=" + getUserTrustIsManaged(userId));
             pw.println("    enabledByUser=" + mFaceSettingEnabledForUser);
+            pw.println("    mSecureCameraLaunched=" + mSecureCameraLaunched);
         }
     }
 }