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

am 6ad12315: Merge "Reformat local Korean numbers in national format." into mnc-dr-dev

Browse Source 
* commit '6ad123156e762a62616de63617ee11afb3cde334':
  Reformat local Korean numbers in national format.
This commit is contained in:
Roshan Pius
2015-08-26 21:25:04 +00:00
committed by Android Git Automerger
parent 243095c9ca 6ad123156e
commit 9df996ed41
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -1135,6 +1135,8 @@ public class PhoneNumberUtils
"VI", // U.S. Virgin Islands "VI", // U.S. Virgin Islands
}; };
private static final String KOREA_ISO_COUNTRY_CODE = "KR";
/** /**
* Breaks the given number down and formats it according to the rules * Breaks the given number down and formats it according to the rules
* for the country the number is from. * for the country the number is from.
@@ -1455,7 +1457,14 @@ public class PhoneNumberUtils
String result = null; String result = null;
try { try {
PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso); PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);
result = util.formatInOriginalFormat(pn, defaultCountryIso); if (KOREA_ISO_COUNTRY_CODE.equals(defaultCountryIso) &&
(pn.getCountryCode() == util.getCountryCodeForRegion(KOREA_ISO_COUNTRY_CODE))) {
// Format local Korean phone numbers with country code to corresponding national
// format which would replace the leading +82 with 0.
result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
} else {
result = util.formatInOriginalFormat(pn, defaultCountryIso);
}
} catch (NumberParseException e) { } catch (NumberParseException e) {
} }
return result; return result;