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

Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 19b27604b6 am: 5df00d8c17

Browse Source 
Change-Id: I18691f8b67c7b2f04edd1bf247fba35f7c13b9cc
This commit is contained in:
Automerger Merge Worker
2020-03-16 20:17:44 +00:00
parent e9ffb190ca 5df00d8c17
commit ce524d941f
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) {