commit 0d9eccf85459f8a94c1b868ee748ac21330a1a39
author Kevin Chyn <kchyn@google.com> Fri Mar 01 16:23:49 2019 -0800
committer Kevin Chyn <kchyn@google.com> Fri Mar 01 18:55:03 2019 -0800
tree 30d4516b9f16403069c7e5d63ebc934d4b778041
parent 8c7968a802aa5a493128006a1939c817d85d8501

Don't cache lockout state in KeyguardUpdateMonitor

Partial revert of ag/5369172 - caching the state makes it too complicated
in SystemUI. Issues are as follows

1) SystemUI did not track lockout per-user
2) SystemUI would not show lockout after the initial error

The bug (b/118235602) is already fixed by calling update*ListeningState
instead of startListening.

Test: 1) Enroll multiple users and set up FP
      2) Lockout one user
      3) Switch to second user
      4) Switch back to first user - lockout message is shown

Test: 1) Lockout user
      2) Unlock with pin/pattern/pass
      3) Look at FingerprintService logs - SysUI does not authenticate
         when the user is already unlocked

Bug: 118235602
Fixes: 126926000



Change-Id: Ia8dd44b0dda4246bd94e5f72bf3b0a72ff20eb13

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 66f68ff..f208118 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -243,8 +243,6 @@
     private boolean mIsDreaming;
     private final DevicePolicyManager mDevicePolicyManager;
     private boolean mLogoutEnabled;
-    private boolean mFingerprintLockedOut;
-    private boolean mFaceLockedOut;
 
     /**
      * Short delay before restarting biometric authentication after a successful try
@@ -649,11 +647,6 @@
             }
         }
 
-        if (msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT
-                || msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT) {
-            mFingerprintLockedOut = true;
-        }
-
         if (msgId == FingerprintManager.FINGERPRINT_ERROR_LOCKOUT_PERMANENT) {
             mLockPatternUtils.requireStrongAuth(
                     LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT,
@@ -669,7 +662,6 @@
     }
 
     private void handleFingerprintLockoutReset() {
-        mFingerprintLockedOut = false;
         updateFingerprintListeningState();
     }
 
@@ -807,11 +799,6 @@
             }
         }
 
-        if (msgId == FaceManager.FACE_ERROR_LOCKOUT
-                || msgId == FaceManager.FACE_ERROR_LOCKOUT_PERMANENT) {
-            mFaceLockedOut = true;
-        }
-
         if (msgId == FaceManager.FACE_ERROR_LOCKOUT_PERMANENT) {
             mLockPatternUtils.requireStrongAuth(
                     LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_LOCKOUT,
@@ -828,7 +815,6 @@
     }
 
     private void handleFaceLockoutReset() {
-        mFaceLockedOut = false;
         updateFaceListeningState();
     }
 
@@ -1616,7 +1602,7 @@
                 (mBouncer && !mKeyguardGoingAway) || mGoingToSleep ||
                 shouldListenForFingerprintAssistant() || (mKeyguardOccluded && mIsDreaming))
                 && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser())
-                && !mKeyguardGoingAway && !mFingerprintLockedOut && mIsPrimaryUser;
+                && !mKeyguardGoingAway && mIsPrimaryUser;
         return shouldListen;
     }
 
@@ -1627,9 +1613,8 @@
         // instance of KeyguardUpdateMonitor for each user but KeyguardUpdateMonitor is user-aware.
         return (mBouncer || mAuthInterruptActive || awakeKeyguard || shouldListenForFaceAssistant())
                 && !mSwitchingUser && !getUserCanSkipBouncer(user) && !isFaceDisabled(user)
-                && !mKeyguardGoingAway && !mFaceLockedOut && mFaceSettingEnabledForUser
-                && mUserManager.isUserUnlocked(user)
-                && mIsPrimaryUser;
+                && !mKeyguardGoingAway && mFaceSettingEnabledForUser
+                && mUserManager.isUserUnlocked(user) && mIsPrimaryUser;
     }