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

Prevent finishing early on single sensor devices. am: 47e8ddbdb9

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

Change-Id: I37dfd3cd27fb0952db602a60663b83b911e616ba
This commit is contained in:
Joe Bolinger
2021-07-01 00:02:34 +00:00
committed by Automerger Merge Worker
parent a095d7f518 47e8ddbdb9
commit de779f2883
1 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,6 +242,7 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
// This will need to be updated if the device has sensors other than BIOMETRIC_STRONG // This will need to be updated if the device has sensors other than BIOMETRIC_STRONG
if (!setupWizard && authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) { if (!setupWizard && authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) {
launchCredentialOnlyEnroll(); launchCredentialOnlyEnroll();
finish();
} else if (canUseFace && canUseFingerprint) { } else if (canUseFace && canUseFingerprint) {
if (mParentalOptionsRequired && mGkPwHandle != null) { if (mParentalOptionsRequired && mGkPwHandle != null) {
launchFaceAndFingerprintEnroll(); launchFaceAndFingerprintEnroll();
@@ -405,22 +406,6 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
super.onApplyThemeResource(theme, newResid, first); super.onApplyThemeResource(theme, newResid, first);
} }
@Override
protected void onStop() {
super.onStop();
if (mConfirmingCredentials
|| mParentalOptionsRequired
|| mMultiBiometricEnrollHelper != null) {
return;
}
if (!isChangingConfigurations()) {
Log.d(TAG, "Finishing in onStop");
finish();
}
}
private void setOrConfirmCredentialsNow() { private void setOrConfirmCredentialsNow() {
if (!mConfirmingCredentials) { if (!mConfirmingCredentials) {
mConfirmingCredentials = true; mConfirmingCredentials = true;