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

Commit 26d1877a authored by Kevin Chyn's avatar Kevin Chyn Committed by Automerger Merge Worker
Browse files

Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll am: 715e337a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15536197

Change-Id: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
parents a882d0fb 715e337a

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

+3 −1
Original line number Diff line number Diff line
@@ -244,7 +244,9 @@ public class BiometricUtils { 
     * @return true if the next enrollment was started

     */

    public static boolean tryStartingNextBiometricEnroll(@NonNull Activity activity,

            int requestCode) {

            int requestCode, String debugReason) {



        Log.d(TAG, "tryStartingNextBiometricEnroll, debugReason: " + debugReason);

        final PendingIntent pendingIntent = (PendingIntent) activity.getIntent()

                .getExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);

        if (pendingIntent != null) {

src/com/android/settings/biometrics/face/FaceEnrollEducation.java

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,8 @@ public class FaceEnrollEducation extends BiometricEnrollBase { 
    }



    protected void onSkipButtonClick(View view) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST,

                "edu_skip")) {

            setResult(RESULT_SKIP);

            finish();

        }

src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java

+8 −4
Original line number Diff line number Diff line
@@ -59,28 +59,32 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction { 


    @Override

    protected void onCancelButtonClick(View view) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST,

                "cancel")) {

            super.onCancelButtonClick(view);

        }

    }



    @Override

    protected void onSkipButtonClick(View view) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST,

                "skip")) {

            super.onSkipButtonClick(view);

        }

    }



    @Override

    protected void onEnrollmentSkipped(@Nullable Intent data) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST,

                "skipped")) {

            super.onEnrollmentSkipped(data);

        }

    }



    @Override

    protected void onFinishedEnrolling(@Nullable Intent data) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {

        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST,

                "finished")) {

            super.onFinishedEnrolling(data);

        }

    }