commit a531cfd0542076fa3fb114a80f3c30eea9eee608
author arunvoddu <arunvoddu@google.com> Thu Dec 22 07:13:27 2022 +0000
committer arunvoddu <arunvoddu@google.com> Fri Dec 23 05:22:12 2022 +0000
tree c33b242243add1867a9863779df45fc932baf240
parent e5efe55d778136cffbdac43a3e224abb61ae4afc

UI changes to reflect the primary IMEI value in hidden menu

Bug: 263447299
Test: Manually verified using hidden menu
Change-Id: Ibba5324da8bdeca14094586416f54fb6cd676e38

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44151c5..79119a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2070,6 +2070,8 @@
 
     <!-- Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_unknown">Unknown</string>
+    <!-- Used for diagnostic info screens, precise translation isn't needed -->
+    <string name="radioInfo_imei_primary">Primary</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="radioInfo_display_packets">pkts</string>
     <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->

src/com/android/phone/settings/RadioInfo.java

diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index ac3259a..574440a 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -29,6 +29,7 @@
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.graphics.Typeface;
+import android.hardware.radio.modem.ImeiInfo;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
@@ -1245,11 +1246,16 @@
         Resources r = getResources();
 
         s = mPhone.getDeviceId();
-        if (s == null) s = r.getString(R.string.radioInfo_unknown);
+        if (s == null) {
+            s = r.getString(R.string.radioInfo_unknown);
+        }  else if (mPhone.getImeiType() == ImeiInfo.ImeiType.PRIMARY) {
+            s = s + " (" + r.getString(R.string.radioInfo_imei_primary) + ")";
+        }
         mDeviceId.setText(s);
 
         s = mPhone.getSubscriberId();
         if (s == null) s = r.getString(R.string.radioInfo_unknown);
+
         mSubscriberId.setText(s);
 
         SubscriptionManager subMgr = getSystemService(SubscriptionManager.class);