Merge "Change resource name to be consistent with fingerprint"
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 3f1ac59..aef48fa 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2914,7 +2914,7 @@
<string name="config_keyguardComponent" translatable="false">com.android.systemui/com.android.systemui.keyguard.KeyguardService</string>
<!-- Limit for the number of face templates per user -->
- <integer name="config_face_MaxTemplatesPerUser">1</integer>
+ <integer name="config_faceMaxTemplatesPerUser">1</integer>
<!-- For performance and storage reasons, limit the number of fingerprints per user -->
<integer name="config_fingerprintMaxTemplatesPerUser">5</integer>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 610d4e6..6054180 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2446,7 +2446,7 @@
<java-symbol type="string" name="face_name_template" />
<!-- Face config -->
- <java-symbol type="integer" name="config_face_MaxTemplatesPerUser" />
+ <java-symbol type="integer" name="config_faceMaxTemplatesPerUser" />
<!-- From various Material changes -->
<java-symbol type="attr" name="titleTextAppearance" />
diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index d2a29e4..35679a88 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -541,7 +541,7 @@
@Override
protected boolean hasReachedEnrollmentLimit(int userId) {
final int limit = getContext().getResources().getInteger(
- com.android.internal.R.integer.config_face_MaxTemplatesPerUser);
+ com.android.internal.R.integer.config_faceMaxTemplatesPerUser);
final int enrolled = FaceService.this.getEnrolledFaces(userId).size();
if (enrolled >= limit) {
Slog.w(TAG, "Too many faces registered");