From 29d7f4910c8f2a62420b7e267dd159c9048202a6 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Tue, 23 May 2017 11:36:35 -0700
Subject: [PATCH] Remove old/unused method of enable fp auth while occluded

shouldListenForFingerprint() had a parentheses bug which is now
removed as well. the function is the same as before now.

Bug: 37875884

Test: manual
Change-Id: I30b68fe40466e0abbb3f15360551f2b279ee246a
---
 .../android/keyguard/KeyguardUpdateMonitor.java   | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
index e7acbb3a133fe..e1544622bf951 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -299,7 +299,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
         }
     };
 
-    private boolean mEnableNextFingerprint;
     private SparseBooleanArray mUserHasTrust = new SparseBooleanArray();
     private SparseBooleanArray mUserTrustIsManaged = new SparseBooleanArray();
     private SparseBooleanArray mUserFingerprintAuthenticated = new SparseBooleanArray();
@@ -315,11 +314,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
         return sCurrentUser;
     }
 
-    public void enableNextFingerprint() {
-        mEnableNextFingerprint = true;
-        if (DEBUG) Log.v(TAG, "enabling next fingerprint");
-    }
-
     @Override
     public void onTrustChanged(boolean enabled, int userId, int flags) {
         mUserHasTrust.put(userId, enabled);
@@ -1133,8 +1127,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     private boolean shouldListenForFingerprint() {
         return (mKeyguardIsVisible || !mDeviceInteractive ||
                     (mBouncer && !mKeyguardGoingAway) || mGoingToSleep)
-                && (!mSwitchingUser && !isFingerprintDisabled(getCurrentUser()) ||
-                mEnableNextFingerprint);
+                && !mSwitchingUser && !isFingerprintDisabled(getCurrentUser());
     }
 
     private void startListeningForFingerprint() {
@@ -1161,11 +1154,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
 
     private void stopListeningForFingerprint() {
         if (DEBUG) Log.v(TAG, "stopListeningForFingerprint()");
-        if (mEnableNextFingerprint) {
-            if (DEBUG) Log.v(TAG, "listening to one more fingerprint");
-            return;
-        }
-
         if (mFingerprintRunningState == FINGERPRINT_STATE_RUNNING) {
             mFingerprintCancelSignal.cancel();
             mFingerprintCancelSignal = null;
@@ -1471,7 +1459,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     private void handleKeyguardReset() {
         if (DEBUG) Log.d(TAG, "handleKeyguardReset");
         updateFingerprintListeningState();
-        mEnableNextFingerprint = false;
         mNeedsSlowUnlockTransition = resolveNeedsSlowUnlockTransition();
     }