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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-16 18:56:54 +00:00
committed by Android (Google) Code Review
parent 6c9cad2caf e6bcc49eb9
commit b2c35f7fcc
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) {