Merge "[Settings] support of getPhoneNumber API"

This commit is contained in:
Bonian Chen
2021-12-08 01:15:27 +00:00
committed by Android (Google) Code Review

View File

@@ -540,13 +540,14 @@ public class SubscriptionUtil {
return null; return null;
} }
TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class); final SubscriptionManager subscriptionManager = context.getSystemService(
String rawPhoneNumber = SubscriptionManager.class);
telephonyManager.getLine1Number(subscriptionInfo.getSubscriptionId()); String rawPhoneNumber = subscriptionManager.getPhoneNumber(
String countryIso = MccTable.countryCodeForMcc(subscriptionInfo.getMccString()); subscriptionInfo.getSubscriptionId());
if (TextUtils.isEmpty(rawPhoneNumber)) { if (TextUtils.isEmpty(rawPhoneNumber)) {
return null; return null;
} }
String countryIso = MccTable.countryCodeForMcc(subscriptionInfo.getMccString());
return PhoneNumberUtils.formatNumber(rawPhoneNumber, countryIso); return PhoneNumberUtils.formatNumber(rawPhoneNumber, countryIso);
} }