Snap for 7637344 from 715e337af8a32ff2d72bfd55014dd14678d42d16 to sc-d1-release (125918fa) · Commits · e / os / android_packages_apps_Settings

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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) {

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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();
	}		}

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

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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);
	}		}
	}		}