Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4ca410a authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7f 

Change-Id: I4eea86045bc033677c33c716c39174314ffe1d7e
parents d3b8d8c6 b2c35f7f

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.