Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[TelephonyMainline] Cannot use UnsupportedAppUsage API"

Browse Source
This commit is contained in:
Zoey Chen
2020-01-13 07:09:54 +00:00
committed by Gerrit Code Review
parent 310d1dac0d 3d42955989
commit 484a87ee98
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java
View File

@@ -16,8 +16,6 @@
package com.android.settingslib; package com.android.settingslib;
import static android.content.Context.TELEPHONY_SERVICE;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
@@ -172,36 +170,38 @@ public class DeviceInfoUtils {
} }
} }
public static String getFormattedPhoneNumber(Context context, SubscriptionInfo subscriptionInfo) { /**
* Format a phone number.
* @param subscriptionInfo {@link SubscriptionInfo} subscription information.
* @return Returns formatted phone number.
*/
public static String getFormattedPhoneNumber(Context context,
SubscriptionInfo subscriptionInfo) {
String formattedNumber = null; String formattedNumber = null;
if (subscriptionInfo != null) { if (subscriptionInfo != null) {
final TelephonyManager telephonyManager = final TelephonyManager telephonyManager = context.getSystemService(
(TelephonyManager) context.getSystemService(TELEPHONY_SERVICE); TelephonyManager.class);
final String rawNumber = final String rawNumber = telephonyManager.createForSubscriptionId(
telephonyManager.getLine1Number(subscriptionInfo.getSubscriptionId()); subscriptionInfo.getSubscriptionId()).getLine1Number();
if (!TextUtils.isEmpty(rawNumber)) { if (!TextUtils.isEmpty(rawNumber)) {
formattedNumber = PhoneNumberUtils.formatNumber(rawNumber); formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
} }
} }
return formattedNumber; return formattedNumber;
} }
public static String getFormattedPhoneNumbers(Context context, public static String getFormattedPhoneNumbers(Context context,
List<SubscriptionInfo> subscriptionInfo) { List<SubscriptionInfo> subscriptionInfoList) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (subscriptionInfo != null) { if (subscriptionInfoList != null) {
final TelephonyManager telephonyManager = final TelephonyManager telephonyManager = context.getSystemService(
(TelephonyManager) context.getSystemService(TELEPHONY_SERVICE); TelephonyManager.class);
final int count = subscriptionInfo.size(); final int count = subscriptionInfoList.size();
for (int i = 0; i < count; i++) { for (SubscriptionInfo subscriptionInfo : subscriptionInfoList) {
final String rawNumber = telephonyManager.getLine1Number( final String rawNumber = telephonyManager.createForSubscriptionId(
subscriptionInfo.get(i).getSubscriptionId()); subscriptionInfo.getSubscriptionId()).getLine1Number();
if (!TextUtils.isEmpty(rawNumber)) { if (!TextUtils.isEmpty(rawNumber)) {
sb.append(PhoneNumberUtils.formatNumber(rawNumber)); sb.append(PhoneNumberUtils.formatNumber(rawNumber)).append("\n");
if (i < count - 1) {
sb.append("\n");
}
} }
} }
} }