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

Do not finish early if caller is SUW

Browse Source 
Fixes: 151576034


Test: Wipe device, go past fingerprint enrollment in SUW, press
      back button. SUW should not get stuck
Change-Id: I9021946dd169acfa205e6bacc4c4581242452983
This commit is contained in:
Kevin Chyn
2020-03-16 09:32:41 -07:00
parent 4a1f517585
commit e6bcc49eb9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,11 +68,13 @@ public class BiometricEnrollActivity extends InstrumentedActivity {
final int result = bm.canAuthenticate(authenticators);
if (result == BiometricManager.BIOMETRIC_SUCCESS
|| result == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
Log.e(TAG, "Unexpected result: " + result);
finish();
return;
if (!WizardManagerHelper.isAnySetupWizard(getIntent())) {
if (result == BiometricManager.BIOMETRIC_SUCCESS
|| result == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
Log.e(TAG, "Unexpected result: " + result);
finish();
return;
}
}
if (authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) {