PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic224ac2515ce4d50e61b52d259487c98d50b0a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Austin Delgado
2023-05-08 22:20:18 +00:00
committed by Automerger Merge Worker
parent 60419e72bd 2971c13923
commit b5eab0589a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/biometrics/BiometricEnrollActivity.java
View File

@@ -326,8 +326,8 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
} }
} }
boolean canUseFace = mIsFaceEnrollable; boolean canUseFace = mHasFeatureFace;
boolean canUseFingerprint = mIsFingerprintEnrollable; boolean canUseFingerprint = mHasFeatureFingerprint;
if (mParentalOptionsRequired) { if (mParentalOptionsRequired) {
if (mParentalOptions == null) { if (mParentalOptions == null) {
throw new IllegalStateException("consent options required, but not set"); throw new IllegalStateException("consent options required, but not set");
@@ -345,10 +345,12 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
} else if (canUseFace || canUseFingerprint) { } else if (canUseFace || canUseFingerprint) {
if (mGkPwHandle == null) { if (mGkPwHandle == null) {
setOrConfirmCredentialsNow(); setOrConfirmCredentialsNow();
} else if (canUseFingerprint) { } else if (canUseFingerprint && mIsFingerprintEnrollable) {
launchFingerprintOnlyEnroll(); launchFingerprintOnlyEnroll();
} else { } else if (canUseFace && mIsFaceEnrollable) {
launchFaceOnlyEnroll(); launchFaceOnlyEnroll();
} else {
setOrConfirmCredentialsNow();
} }
} else { // no modalities available } else { // no modalities available
if (mParentalOptionsRequired) { if (mParentalOptionsRequired) {