Merge "Don't need to authenticate fingerprint when the fingerprint list is empty...

am: e7da16fc8f

Change-Id: Idd10ba2234522c1679ebfbbc48c7bfda742f0a4e

diff --cc src/com/android/settings/fingerprint/FingerprintSettings.java
index 719187a,a2ce9b2..6a8a1fd
--- 1/src/com/android/settings/fingerprint/FingerprintSettings.java
--- 2/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@@ -280,14 -278,10 +280,15 @@@ public class FingerprintSettings extend
          }
  
          private void retryFingerprint() {
-             if (mRemovalSidecar.inProgress()) {
+             if (mRemovalSidecar.inProgress()
+                     || 0 == mFingerprintManager.getEnrolledFingerprints(mUserId).size()) {
                  return;
              }
 +            // Don't start authentication if ChooseLockGeneric is showing, otherwise if the user
 +            // is in FP lockout, a toast will show on top
 +            if (mLaunchedConfirm) {
 +                return;
 +            }
              if (!mInFingerprintLockout) {
                  mFingerprintCancel = new CancellationSignal();
                  mFingerprintManager.authenticate(null, mFingerprintCancel, 0 /* flags */,