Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923 am: 083f9699c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I106e43e195e97d54846b3a178cba875177e47fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index 4d05946..ebbe2e8 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -326,8 +326,8 @@
}
}
- 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 @@
} 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) {