From a2b0146d07f9caf5df51c942adc60a259fffd7f3 Mon Sep 17 00:00:00 2001
From: Thomas Nguyen <tnd@google.com>
Date: Tue, 2 Aug 2022 18:24:19 +0000
Subject: [PATCH] Provide useful hint when invalid SIM PIN is entered during
 changing SIM PIN

Bug: 241441049
Test: Manually tested with Pixel 6 Pro

Change-Id: Ie7239ad397dfeacd59f1483953392ee7935cfd07
---
 res/values/strings.xml                        | 4 ++--
 src/com/android/settings/IccLockSettings.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb5bddec147..040bc3737a5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3231,8 +3231,8 @@
     <string name="sim_reenter_new">Re\u2011type new PIN</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
     <string name="sim_change_pin">SIM PIN</string>
-    <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
-    <string name="sim_bad_pin">Incorrect PIN</string>
+    <!-- SIM card lock settings screen, SIM PIN dialog message when invalid PIN is entered  [CHAR LIMIT=40] -->
+    <string name="sim_invalid_pin_hint">Type a PIN that is 4 to 8 numbers</string>
     <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
     <string name="sim_pins_dont_match">PINs don\u2019t match</string>
     <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 71eb0f20e30..9e6f0843924 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -476,7 +476,7 @@ public class IccLockSettings extends SettingsPreferenceFragment
         mPin = preference.getText();
         if (!reasonablePin(mPin)) {
             // inject error message and display dialog again
-            mError = mRes.getString(R.string.sim_bad_pin);
+            mError = mRes.getString(R.string.sim_invalid_pin_hint);
             showPinDialog();
             return;
         }