From 3dfad58897b33ec75813c12433a2dc5106a66ec8 Mon Sep 17 00:00:00 2001
From: Bonian Chen <bonianchen@google.com>
Date: Tue, 30 Nov 2021 09:48:27 +0800
Subject: [PATCH] [Settings] support of getPhoneNumber API

Access to new API for retrieving phone number.

Bug: 208321353
Test: local build pass
Change-Id: I8484f94934670f24c80c95df89e8752420c1f439
---
 src/com/android/settings/network/SubscriptionUtil.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index c77a294d1c4..d7e5876c5a4 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -540,13 +540,14 @@ public class SubscriptionUtil {
             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);
     }