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

Commit 6e745242 authored by Austin Delgado's avatar Austin Delgado
Browse files

Fix going back after biometric enrollment in SUW

Bug: 280530120
Test: atest BiometricEnrollActivityTest
Test: tested manually by swiping back after enrollments
Change-Id: I305dd0904f86e2fc77f02047de8f3fc2c54621cb
parent 3f4820bd
Loading
Loading
Loading
Loading
+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) {