Merge \"Move phone number formatting logic into DeviceInfoUtils.\" into nyc-mr1-dev (1a18a574) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java

+41 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,9 @@ import android.content.pm.ApplicationInfo;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	import android.content.pm.ResolveInfo;		import android.content.pm.ResolveInfo;
	import android.os.Build;		import android.os.Build;
			import android.telephony.PhoneNumberUtils;
			import android.telephony.SubscriptionInfo;
			import android.telephony.TelephonyManager;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.text.format.DateFormat;		import android.text.format.DateFormat;
	import android.util.Log;		import android.util.Log;
	@@ -37,6 +40,8 @@ import java.util.Locale;
	import java.util.regex.Matcher;		import java.util.regex.Matcher;
	import java.util.regex.Pattern;		import java.util.regex.Pattern;

			import static android.content.Context.TELEPHONY_SERVICE;

	public class DeviceInfoUtils {		public class DeviceInfoUtils {
	private static final String TAG = "DeviceInfoUtils";		private static final String TAG = "DeviceInfoUtils";

	@@ -169,4 +174,40 @@ public class DeviceInfoUtils {
	}		}
	}		}

			public static String getFormattedPhoneNumber(Context context, SubscriptionInfo subscriptionInfo) {
			String formattedNumber = null;
			if (subscriptionInfo != null) {
			final TelephonyManager telephonyManager =
			(TelephonyManager) context.getSystemService(TELEPHONY_SERVICE);
			final String rawNumber =
			telephonyManager.getLine1Number(subscriptionInfo.getSubscriptionId());
			if (!TextUtils.isEmpty(rawNumber)) {
			formattedNumber = PhoneNumberUtils.formatNumber(rawNumber);
			}

			}
			return formattedNumber;
			}

			public static String getFormattedPhoneNumbers(Context context,
			List<SubscriptionInfo> subscriptionInfo) {
			StringBuilder sb = new StringBuilder();
			if (subscriptionInfo != null) {
			final TelephonyManager telephonyManager =
			(TelephonyManager) context.getSystemService(TELEPHONY_SERVICE);
			final int count = subscriptionInfo.size();
			for (int i = 0; i < count; i++) {
			final String rawNumber = telephonyManager.getLine1Number(
			subscriptionInfo.get(i).getSubscriptionId());
			if (!TextUtils.isEmpty(rawNumber)) {
			sb.append(PhoneNumberUtils.formatNumber(rawNumber));
			if (i < count - 1) {
			sb.append("\n");
			}
			}
			}
			}
			return sb.toString();
			}

	}		}