From c976efa3e681b1ff113d8385bc200c3d088c6131 Mon Sep 17 00:00:00 2001 From: Kevin Chyn Date: Fri, 7 Jun 2019 12:41:05 -0700 Subject: [PATCH] Do not stay on education page if user has enrolled max templates Fixes: 134769754 Test: Enroll max templates, go back, intro screen is seen instead Change-Id: I4a5f8d71abff88688f7c77860bb44caa95d17d61 --- .../settings/biometrics/face/FaceEnrollEducation.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java index 429d93bd5ce..4add43ac205 100644 --- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java +++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java @@ -169,6 +169,15 @@ public class FaceEnrollEducation extends BiometricEnrollBase { super.onResume(); mSwitchDiversityListener.onCheckedChanged(mSwitchDiversity.getSwitch(), mSwitchDiversity.isChecked()); + + // If the user goes back after enrollment, we should send them back to the intro page + // if they've met the max limit. + final int max = getResources().getInteger( + com.android.internal.R.integer.config_faceMaxTemplatesPerUser); + final int numEnrolledFaces = mFaceManager.getEnrolledFaces(mUserId).size(); + if (numEnrolledFaces >= max) { + finish(); + } } @Override