Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5101b30 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Change resource name to be consistent with fingerprint"

parents d5763071 017e76e7

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -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" />

services/core/java/com/android/server/biometrics/face/FaceService.java

+1 −1
Original line number Diff line number Diff line
@@ -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");