commit 3660031853dd3ad3b0a6cac949c406c64fb65b14
author Bonian Chen <bonianchen@google.com> Wed Dec 08 01:15:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 08 01:15:27 2021 +0000
tree 11a007a77935a4cfe159cf97f3d3965c0c23f210
parent 0b97fbff6492c81bc719ce63a736b8416b76d9b8
parent 3dfad58897b33ec75813c12433a2dc5106a66ec8

Merge "[Settings] support of getPhoneNumber API"

src/com/android/settings/network/SubscriptionUtil.java

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index c77a294..d7e5876 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -540,13 +540,14 @@
             return null;
         }
 
-        TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);
-        String rawPhoneNumber =
-                telephonyManager.getLine1Number(subscriptionInfo.getSubscriptionId());
-        String countryIso = MccTable.countryCodeForMcc(subscriptionInfo.getMccString());
+        final SubscriptionManager subscriptionManager = context.getSystemService(
+                SubscriptionManager.class);
+        String rawPhoneNumber = subscriptionManager.getPhoneNumber(
+                subscriptionInfo.getSubscriptionId());
         if (TextUtils.isEmpty(rawPhoneNumber)) {
             return null;
         }
+        String countryIso = MccTable.countryCodeForMcc(subscriptionInfo.getMccString());
         return PhoneNumberUtils.formatNumber(rawPhoneNumber, countryIso);
     }