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

Prevent finishing early on single sensor devices.

Browse Source 
Fixes regression from commit c358adad56.

Fix: 192420564
Fix: 188847063

Test: manual enroll face & fingerprint via setup wizard (on fp, face, & fp+face device variants)
Change-Id: If7027e4d0ddf9d73daf91f174f237e4eb1621ea7
This commit is contained in:
Joe Bolinger
2021-06-30 14:09:44 -07:00
parent c17876365a
commit 47e8ddbdb9
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;