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

Commit 65a9252d authored by Austin Delgado's avatar Austin Delgado Committed by Automerger Merge Worker
Browse files

Merge "Fix going back after biometric enrollment in SUW" into udc-dev am:... 

Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c139 am: 083f9699 am: 8854736a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222



Change-Id: Iea88b3ced694723b3109a4e8fdae228396c105f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0bca9aa 8854736a

src/com/android/settings/biometrics/BiometricEnrollActivity.java

+6 −4
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 
            }

        }



        boolean canUseFace = mIsFaceEnrollable;

        boolean canUseFingerprint = mIsFingerprintEnrollable;

        boolean canUseFace = mHasFeatureFace;

        boolean canUseFingerprint = mHasFeatureFingerprint;

        if (mParentalOptionsRequired) {

            if (mParentalOptions == null) {

                throw new IllegalStateException("consent options required, but not set");
@@ -345,10 +345,12 @@ public class BiometricEnrollActivity extends InstrumentedActivity { 
        } else if (canUseFace || canUseFingerprint) {

            if (mGkPwHandle == null) {

                setOrConfirmCredentialsNow();

            } else if (canUseFingerprint) {

            } else if (canUseFingerprint && mIsFingerprintEnrollable) {

                launchFingerprintOnlyEnroll();

            } else {

            } else if (canUseFace && mIsFaceEnrollable) {

                launchFaceOnlyEnroll();

            } else {

                setOrConfirmCredentialsNow();

            }

        } else { // no modalities available

            if (mParentalOptionsRequired) {