From 940fc8f39e5da2686d6cdc957a439ddbf96c6c4f Mon Sep 17 00:00:00 2001
From: tomhsu <tomhsu@google.com>
Date: Tue, 24 Dec 2024 02:21:14 +0000
Subject: [PATCH] Avoid string mismatch of menu name and dialog title

 - 2 different strings cause this issue.

Flag: EXEMPT bug fix
Fix: b/385687217
Test: Manual test
Change-Id: Ib1a5b8271d7825d95a09c3d6c11fa66a1a6cb0e5
---
 res/values/strings.xml                                       | 5 -----
 .../settings/network/telephony/MobileNetworkSettings.java    | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 89f6d8fb44d..dfa18c630a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12267,11 +12267,6 @@
     <!-- Summary for an item in the page listing multiple mobile service subscriptions, indicating
          that service is inactive and is tied to an eSIM profile [CHAR LIMIT=40] -->
     <string name="mobile_network_inactive_esim">Inactive / eSIM</string>
-    <!-- Title of a dialog that lets a user modify the display name used for a mobile network
-         subscription in various places in the Settings app. The default name is typically just the
-         carrier name, but especially in multi-SIM configurations users may want to use a different
-         name. [CHAR LIMIT=40] -->
-    <string name="mobile_network_sim_name">SIM name &amp; color</string>
     <!-- Label for an item listing the name of the SIM that the user has specified. [CHAR LIMIT=40] -->
     <string name="mobile_network_sim_name_label">Name</string>
     <!-- Label for an item listing the color of the SIM that the user has specified. [CHAR LIMIT=40] -->
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index d934c99634b..f201b1ab037 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -468,7 +468,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
             final MenuItem item = menu.add(Menu.NONE, R.id.edit_sim_name, Menu.NONE,
-                    R.string.mobile_network_sim_name);
+                    R.string.mobile_network_sim_label_color_title);
             item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
             item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         }