From 952a19ab93b272f75abbea8fba5b2aff2062f6f5 Mon Sep 17 00:00:00 2001
From: Joshua Mccloskey <joshmccloskey@google.com>
Date: Tue, 6 Apr 2021 17:14:03 -0700
Subject: [PATCH] Added additional strings for fpm

Test: Verified that strings are available
Bug: 184591799
Change-Id: I3961271a94b8ee9b4ded4672b0d2874c54f48e29
---
 .../fingerprint/FingerprintManager.java       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 7b6e1299e8e1e..ab9e0dffc428d 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -1268,12 +1268,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
                 return context.getString(
                         com.android.internal.R.string.fingerprint_error_security_update_required);
             case FINGERPRINT_ERROR_VENDOR: {
-                    String[] msgArray = context.getResources().getStringArray(
-                            com.android.internal.R.array.fingerprint_error_vendor);
-                    if (vendorCode < msgArray.length) {
+                String[] msgArray = context.getResources().getStringArray(
+                        com.android.internal.R.array.fingerprint_error_vendor);
+                if (vendorCode < msgArray.length) {
+                    if (Build.IS_ENG || Build.IS_USERDEBUG) {
                         return msgArray[vendorCode];
+                    } else {
+                        return context.getString(
+                            com.android.internal.R.string.fingerprint_error_unable_to_process);
                     }
                 }
+            }
         }
         Slog.w(TAG, "Invalid error message: " + errMsg + ", " + vendorCode);
         return null;
@@ -1302,12 +1307,17 @@ public class FingerprintManager implements BiometricAuthenticator, BiometricFing
                 return context.getString(
                     com.android.internal.R.string.fingerprint_acquired_too_fast);
             case FINGERPRINT_ACQUIRED_VENDOR: {
-                    String[] msgArray = context.getResources().getStringArray(
-                            com.android.internal.R.array.fingerprint_acquired_vendor);
-                    if (vendorCode < msgArray.length) {
+                String[] msgArray = context.getResources().getStringArray(
+                        com.android.internal.R.array.fingerprint_acquired_vendor);
+                if (vendorCode < msgArray.length) {
+                    if (Build.IS_ENG || Build.IS_USERDEBUG) {
                         return msgArray[vendorCode];
+                    } else {
+                        return context.getString(
+                            com.android.internal.R.string.fingerprint_error_unable_to_process);
                     }
                 }
+            }
                 break;
             case FINGERPRINT_ACQUIRED_START:
                 return null;