[automerger skipped] DO NOT MERGE Use original country locale to parse phone number without country code. am: 1f4477d330
am: 7c6cd836e2 -s ours
am skip reason: subject contains skip directive
Change-Id: If6dac67de39b82281e29eb7d3dd163d663c28184
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6076e9b..d303ba5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,11 +20,11 @@
coreApp="true"
android:sharedUserId="android.uid.phone">
- <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
- <uses-permission android:name="android.permission.READ_SMS"/>
+ <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+ <uses-permission android:name="android.permission.READ_SMS" />
<uses-permission android:name="android.permission.WRITE_SMS"/>
<uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"/>
- <uses-permission android:name="android.permission.BIND_CARRIER_SERVICES" />
+ <uses-permission android:name="android.permission.BIND_CARRIER_SERVICES"/>
<!-- BIND_CARRIER_MESSAGING_SERVICE has been deprecated in favor of BIND_CARRIER_SERVICES. -->
<uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
diff --git a/src/com/android/mms/service/MmsHttpClient.java b/src/com/android/mms/service/MmsHttpClient.java
index 191ab7e..1e77134 100644
--- a/src/com/android/mms/service/MmsHttpClient.java
+++ b/src/com/android/mms/service/MmsHttpClient.java
@@ -455,7 +455,7 @@
* Example: "LINE1" returns the phone number, etc.
*
* @param macro The macro name
- * @param mmsConfig The MMS config which contains NAI suffix and SIM country ISO to override.
+ * @param mmsConfig The MMS config which contains NAI suffix.
* @param subId The subscription ID used to get line number, etc.
* @return The value of the defined macro
*/
@@ -464,7 +464,7 @@
if (MACRO_LINE1.equals(macro)) {
return getLine1(context, subId);
} else if (MACRO_LINE1NOCOUNTRYCODE.equals(macro)) {
- return getLine1NoCountryCode(context, mmsConfig, subId);
+ return getLine1NoCountryCode(context, subId);
} else if (MACRO_NAI.equals(macro)) {
return getNai(context, mmsConfig, subId);
}
@@ -484,16 +484,13 @@
/**
* Returns the phone number (without country code) for the given subscription ID.
*/
- private static String getLine1NoCountryCode(Context context, Bundle mmsConfig, int subId) {
+ private static String getLine1NoCountryCode(Context context, int subId) {
final TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(
Context.TELEPHONY_SERVICE);
- String countryIsoOverride =
- mmsConfig.getString(SmsManager.MMS_CONFIG_SIM_COUNTRY_ISO_OVERRIDE);
return PhoneUtils.getNationalNumber(
- telephonyManager,
- subId,
- telephonyManager.getLine1Number(subId),
- countryIsoOverride);
+ telephonyManager,
+ subId,
+ telephonyManager.getLine1Number(subId));
}
/**
diff --git a/src/com/android/mms/service/PhoneUtils.java b/src/com/android/mms/service/PhoneUtils.java
index a736ee2..54b7ba9 100644
--- a/src/com/android/mms/service/PhoneUtils.java
+++ b/src/com/android/mms/service/PhoneUtils.java
@@ -37,17 +37,11 @@
* @param telephonyManager
* @param subId The SIM ID associated with this number
* @param phoneText The input phone number text
- * @param countryIsoOverride String to override sim country iso.
* @return The formatted number or the original phone number if failed to parse
*/
public static String getNationalNumber(TelephonyManager telephonyManager, int subId,
- String phoneText, String countryIsoOverride) {
- String country = getSimOrDefaultLocaleCountry(telephonyManager, subId);
-
- if (!TextUtils.isEmpty(countryIsoOverride)) {
- country = countryIsoOverride.toUpperCase();
- }
-
+ String phoneText) {
+ final String country = getSimOrDefaultLocaleCountry(telephonyManager, subId);
final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
final Phonenumber.PhoneNumber parsed = getParsedNumber(phoneNumberUtil, phoneText, country);
if (parsed == null) {