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

Commit bb8be99c authored by MiltonWu's avatar MiltonWu
Browse files

Fix calibrator missing during suw page switch 

Pass previous calibrator uuid to next fingerprint enroll activity

Bug: 318453900
Test: Manully test suw fingerprint flow
Change-Id: Iad1e9e1811f58fa880b8d05a722b7fdf57a814fa
parent 946f52b2

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements 
    private boolean mIsFolded;

    private boolean mIsReverseDefaultRotation;

    @Nullable

    private UdfpsEnrollCalibrator mCalibrator;

    protected UdfpsEnrollCalibrator mCalibrator;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction { 
    private DevicePolicyManager mDevicePolicyManager;

    private boolean mCanAssumeUdfps;

    @Nullable

    private UdfpsEnrollCalibrator mCalibrator;

    protected UdfpsEnrollCalibrator mCalibrator;



    @Override

    protected void onCreate(Bundle savedInstanceState) {

src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFindSensor.java

+6 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.settings.R; 
import com.android.settings.SetupWizardUtils;

import com.android.settings.biometrics.BiometricUtils;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

import com.android.settings.flags.Flags;

import com.android.settings.password.ChooseLockSettingsHelper;



public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor {
@@ -48,6 +49,11 @@ public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSenso 
        }

        BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);

        SetupWizardUtils.copySetupExtras(getIntent(), intent);

        if (Flags.udfpsEnrollCalibration()) {

            if (mCalibrator != null) {

                intent.putExtras(mCalibrator.getExtrasForNextIntent(true));

            }

        }

        return intent;

    }

src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java

+6 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.view.View; 
import com.android.settings.SetupWizardUtils;

import com.android.settings.Utils;

import com.android.settings.biometrics.BiometricUtils;

import com.android.settings.flags.Flags;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.password.SetupSkipDialog;
@@ -46,6 +47,11 @@ public class SetupFingerprintEnrollIntroduction extends FingerprintEnrollIntrodu 
                    BiometricUtils.getGatekeeperPasswordHandle(getIntent()));

        }

        SetupWizardUtils.copySetupExtras(getIntent(), intent);

        if (Flags.udfpsEnrollCalibration()) {

            if (mCalibrator != null) {

                intent.putExtras(mCalibrator.getExtrasForNextIntent(false));

            }

        }

        return intent;

    }