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

Commit d382eee7 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['ag/20919289'] into tm-qpr2-release. 

Change-Id: I93213ba09a855945301556ad149220d360ff8f29
parents 6d0bd58e 5b9653f5

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

+8 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.settings.SetupWizardUtils; 
import com.android.settings.biometrics.face.FaceEnrollIntroduction;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;

import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;

import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;

import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;

import com.android.settings.password.ChooseLockGeneric;

import com.android.settings.password.ChooseLockSettingsHelper;
@@ -152,9 +153,13 @@ public class BiometricUtils { 
     */

    public static Intent getFingerprintFindSensorIntent(@NonNull Context context,

            @NonNull Intent activityIntent) {

        Intent intent = new Intent(context, FingerprintEnrollFindSensor.class);

        if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {

            Intent intent = new Intent(context, SetupFingerprintEnrollFindSensor.class);

            SetupWizardUtils.copySetupExtras(activityIntent, intent);

            return intent;

        } else {

            return new Intent(context, FingerprintEnrollFindSensor.class);

        }

    }



    /**