Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a021850f am: f95e7f9056

am: e7da16fc8f Change-Id: Idd10ba2234522c1679ebfbbc48c7bfda742f0a4e
2017-09-14 20:41:44 +00:00
parent aec1784122 e7da16fc8f
commit d0331b8152
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/fingerprint/FingerprintSettings.java
@@ -280,7 +280,8 @@ public class FingerprintSettings extends SubSettings {
        }

        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