commit c746f64761935370bfb359811323e6959cb06395
author Meng Wang <mewan@google.com> Wed Jan 05 23:29:23 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 05 23:29:23 2022 +0000
tree ed908bfcbd11ecb9334b34fa8389806c1972d1d0
parent 0dc1cfd6fff1ea20ba8bbf331f09f00a252974aa
parent cdacac71eb412c9e05972ca13ce717c5c935498a

Merge "Show phone numbers from all sources in hidden menu" am: cdacac71eb

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1920857

Change-Id: I911d2b87700175830baa2b67f5b914fcbec5161b

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 7bf4697..6728138 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -1175,9 +1175,16 @@
         if (s == null) s = r.getString(R.string.radioInfo_unknown);
         mSubscriberId.setText(s);
 
-        //FIXME: Replace with a TelephonyManager call
-        s = mPhone.getLine1Number();
-        if (s == null) s = r.getString(R.string.radioInfo_unknown);
+        SubscriptionManager subMgr = getSystemService(SubscriptionManager.class);
+        int subId = mPhone.getSubId();
+        s = subMgr.getPhoneNumber(subId)
+                + " { CARRIER:"
+                + subMgr.getPhoneNumber(subId, SubscriptionManager.PHONE_NUMBER_SOURCE_CARRIER)
+                + ", UICC:"
+                + subMgr.getPhoneNumber(subId, SubscriptionManager.PHONE_NUMBER_SOURCE_UICC)
+                + ", IMS:"
+                + subMgr.getPhoneNumber(subId, SubscriptionManager.PHONE_NUMBER_SOURCE_IMS)
+                + " }";
         mLine1Number.setText(s);
     }