Merge "Do not finish early if caller is SUW" into rvc-dev (b2c35f7f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/BiometricEnrollActivity.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -68,12 +68,14 @@ public class BiometricEnrollActivity extends InstrumentedActivity {

		final int result = bm.canAuthenticate(authenticators);

		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) {
		// If only device credential was specified, ask the user to only set that up.