From 543ad9f9e5df0967032785d5385a1581c5e5bac2 Mon Sep 17 00:00:00 2001
From: Joe Bolinger <jbolinger@google.com>
Date: Sat, 3 Jun 2023 01:49:39 +0000
Subject: [PATCH] Add "Face" to not recognized message for face auth.

Bug: 272510026
Test: manual (use BP test app with coex, fail face and fingerprint auth and check not recognized message)
Change-Id: I22452b3476dbabe8cfe28500bc41ed209bbafa9f
---
 core/res/res/values/strings.xml                             | 2 ++
 core/res/res/values/symbols.xml                             | 1 +
 .../src/com/android/systemui/biometrics/AuthController.java | 6 +++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index fb3acbe79114d..4f2eadc0f1eaa 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1789,6 +1789,8 @@
     <string name="biometric_error_user_canceled">Authentication canceled</string>
     <!-- Message shown by the biometric dialog when biometric is not recognized -->
     <string name="biometric_not_recognized">Not recognized</string>
+    <!-- Message shown by the biometric dialog when face is not recognized [CHAR LIMIT=50] -->
+    <string name="biometric_face_not_recognized">Face not recognized</string>
     <!-- Message shown when biometric authentication has been canceled [CHAR LIMIT=50] -->
     <string name="biometric_error_canceled">Authentication canceled</string>
     <!-- Message returned to applications if BiometricPrompt setAllowDeviceCredentials is enabled but no pin, pattern, or password is set. [CHAR LIMIT=NONE] -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index d70c283b33bc3..eff006007e020 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -2571,6 +2571,7 @@
   <java-symbol type="string" name="biometric_error_hw_unavailable" />
   <java-symbol type="string" name="biometric_error_user_canceled" />
   <java-symbol type="string" name="biometric_not_recognized" />
+  <java-symbol type="string" name="biometric_face_not_recognized" />
   <java-symbol type="string" name="biometric_error_canceled" />
   <java-symbol type="string" name="biometric_error_device_not_secured" />
   <java-symbol type="string" name="biometric_error_generic" />
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
index 57f1928fe5454..8d51375ed2cea 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
@@ -1048,6 +1048,10 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
         return false;
     }
 
+    private String getNotRecognizedString(@Modality int modality) {
+        return mContext.getString(modality == TYPE_FACE
+                ? R.string.biometric_face_not_recognized : R.string.biometric_not_recognized);
+    }
 
     private String getErrorString(@Modality int modality, int error, int vendorCode) {
         switch (modality) {
@@ -1094,7 +1098,7 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
                 mCurrentDialog.animateToCredentialUI();
             } else if (isSoftError) {
                 final String errorMessage = (error == BiometricConstants.BIOMETRIC_PAUSED_REJECTED)
-                        ? mContext.getString(R.string.biometric_not_recognized)
+                        ? getNotRecognizedString(modality)
                         : getErrorString(modality, error, vendorCode);
                 if (DEBUG) Log.d(TAG, "onBiometricError, soft error: " + errorMessage);
                 // The camera privacy error can return before the prompt initializes its state,