From 017e76e7bc4acfd027b5b3044ee2dcac8799d474 Mon Sep 17 00:00:00 2001
From: Kevin Chyn <kchyn@google.com>
Date: Wed, 27 Jun 2018 18:35:06 -0700
Subject: [PATCH] Change resource name to be consistent with fingerprint

Fixes: 110906179

Test: builds
Change-Id: Id8a786c961ec8e11ebdc7377dff9c82200ba797a
---
 core/res/res/values/config.xml                                  | 2 +-
 core/res/res/values/symbols.xml                                 | 2 +-
 .../java/com/android/server/biometrics/face/FaceService.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 978e0ad043a23..4b75d824ee3d3 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 e47c8c9ecf887..53bee58f23e0d 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2449,7 +2449,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 d2a29e48b6889..35679a8824b1b 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 @@ public class FaceService extends BiometricService {
     @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");