From a38a05769a708912b7f1a1d99c79d19d6687de51 Mon Sep 17 00:00:00 2001
From: Vincent Wang <firewall@google.com>
Date: Wed, 10 Apr 2024 06:05:38 +0000
Subject: [PATCH] Update string for acquire msg
 FINGERPRINT_ACQUIRED_IMAGER_DIRTY on UDFPS devices

Bug: b/330640273
Test: 1. Use tape or water to cover the FP sensor on UDFPS devices
      2. Try to enroll fingerprint
      3. Check the displayed message is correct in enrolling page
Change-Id: I9415e9e58336daa2da6eb4febf1eea7a30d07dc5
---
 res/values/strings.xml                                    | 3 +++
 .../fingerprint/FingerprintEnrollEnrolling.java           | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 835cc24efe5..8264d590062 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13189,4 +13189,7 @@
     <string name="force_swcrypto_fallback_title">Force Software Secure Crypto</string>
      <!-- Developer settings summary: select to force Software Secure Crypto.[CHAR LIMIT=NONE] -->
     <string name="force_swcrypto_fallback_summary">Force DRM key management to use software-based whitebox crypto</string>
+
+    <!--Text for acquire msg on UDFPS devices -->
+    <string name="fingerprint_acquired_imager_dirty_udfps">Clean your screen near the sensor and try again</string>
 </resources>
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index bbeaf2afb85..17e7422fb34 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static android.hardware.biometrics.BiometricAuthenticator.TYPE_FINGERPRINT;
+import static android.hardware.biometrics.BiometricFingerprintConstants.FINGERPRINT_ACQUIRED_IMAGER_DIRTY;
 import static android.text.Layout.HYPHENATION_FREQUENCY_NONE;
 
 import android.animation.Animator;
@@ -770,10 +771,15 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
 
     @Override
     public void onEnrollmentHelp(int helpMsgId, CharSequence helpString) {
-        final CharSequence featuredString = mCanAssumeSfps
+        CharSequence featuredString = mCanAssumeSfps
                 ? mSfpsEnrollmentFeature.getFeaturedVendorString(this, helpMsgId, helpString)
                 : helpString;
 
+        if (helpMsgId == FINGERPRINT_ACQUIRED_IMAGER_DIRTY && mCanAssumeUdfps) {
+            featuredString = getResources().getString(
+                    R.string.fingerprint_acquired_imager_dirty_udfps);
+        }
+
         if (!TextUtils.isEmpty(featuredString)) {
             if (!(mCanAssumeUdfps || mCanAssumeSfps)) {
                 mErrorText.removeCallbacks(mTouchAgainRunnable);