PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add debugReason to BiometricUtils#tryStartingNextBiometricEnroll

Browse Source 
Bug: 196060286
Test: adb shell am start -a android.settings.BIOMETRIC_ENROLL
Change-Id: Ib157dd916b1cfd2238cf6844a970d70cbf56faa6
This commit is contained in:
Kevin Chyn
2021-08-11 16:31:36 -07:00
parent 4d8e7b1053
commit 715e337af8
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/biometrics/BiometricUtils.java
View File

@@ -244,7 +244,9 @@ public class BiometricUtils {
* @return true if the next enrollment was started * @return true if the next enrollment was started
*/ */
public static boolean tryStartingNextBiometricEnroll(@NonNull Activity activity, 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() final PendingIntent pendingIntent = (PendingIntent) activity.getIntent()
.getExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE); .getExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);
if (pendingIntent != null) { if (pendingIntent != null) {

3
src/com/android/settings/biometrics/face/FaceEnrollEducation.java
View File

@@ -216,7 +216,8 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
} }
protected void onSkipButtonClick(View view) { 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); setResult(RESULT_SKIP);
finish(); finish();
} }

12
src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
View File

@@ -59,28 +59,32 @@ public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
@Override @Override
protected void onCancelButtonClick(View view) { 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); super.onCancelButtonClick(view);
} }
} }
@Override @Override
protected void onSkipButtonClick(View view) { 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); super.onSkipButtonClick(view);
} }
} }
@Override @Override
protected void onEnrollmentSkipped(@Nullable Intent data) { 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); super.onEnrollmentSkipped(data);
} }
} }
@Override @Override
protected void onFinishedEnrolling(@Nullable Intent data) { 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); super.onFinishedEnrolling(data);
} }
} }