From 715e337af8a32ff2d72bfd55014dd14678d42d16 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Wed, 11 Aug 2021 16:31:36 -0700 Subject: [PATCH] Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll Bug: 196060286 Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL Change-Id: Ib157dd916b1cfd2238cf6844a970d70cbf56faa6 --- .../android/settings/biometrics/BiometricUtils.java | 4 +++- .../biometrics/face/FaceEnrollEducation.java | 3 ++- .../biometrics/face/FaceEnrollIntroduction.java | 12 ++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java index a98c3555f71..7dd63850dee 100644 --- a/src/com/android/settings/biometrics/BiometricUtils.java +++ b/src/com/android/settings/biometrics/BiometricUtils.java @@ -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) { diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index fa8f5564f2e..6509d4e6e2e 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java @@ -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(); } diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java index e9092c795ea..1de4bc71c3d 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java @@ -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); } }