Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0331b81 authored by edgar.huang's avatar edgar.huang Committed by android-build-merger
Browse files

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

Merge "Don't need to authenticate fingerprint when the fingerprint list is empty." am: 62a02185 am: f95e7f90
am: e7da16fc

Change-Id: Idd10ba2234522c1679ebfbbc48c7bfda742f0a4e
parents aec17841 e7da16fc

src/com/android/settings/fingerprint/FingerprintSettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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