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

Merge "Format Japanese numbers using national format when in Japan."

Browse Source
This commit is contained in:
Tyler Gunn
2017-02-27 02:48:10 +00:00
committed by Gerrit Code Review
parent e091985bb5 3b8f62b602
commit 050e5ddb4f
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1139,6 +1139,8 @@ public class PhoneNumberUtils
private static final String KOREA_ISO_COUNTRY_CODE = "KR"; private static final String KOREA_ISO_COUNTRY_CODE = "KR";
private static final String JAPAN_ISO_COUNTRY_CODE = "JP";
/** /**
* 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.
@@ -1459,15 +1461,25 @@ public class PhoneNumberUtils
String result = null; String result = null;
try { try {
PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso); PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);
if (KOREA_ISO_COUNTRY_CODE.equalsIgnoreCase(defaultCountryIso) &&
(pn.getCountryCode() == util.getCountryCodeForRegion(KOREA_ISO_COUNTRY_CODE)) &&
(pn.getCountryCodeSource() ==
PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN)) {
/** /**
* Need to reformat any local Korean phone numbers (when the user is in Korea) with * Need to reformat any local Korean phone numbers (when the user is in Korea) with
* country code to corresponding national format which would replace the leading * country code to corresponding national format which would replace the leading
* +82 with 0. * +82 with 0.
*/ */
if (KOREA_ISO_COUNTRY_CODE.equals(defaultCountryIso) && result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
(pn.getCountryCode() == util.getCountryCodeForRegion(KOREA_ISO_COUNTRY_CODE)) && } else if (JAPAN_ISO_COUNTRY_CODE.equalsIgnoreCase(defaultCountryIso) &&
pn.getCountryCode() == util.getCountryCodeForRegion(JAPAN_ISO_COUNTRY_CODE) &&
(pn.getCountryCodeSource() == (pn.getCountryCodeSource() ==
PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN)) { PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN)) {
/**
* Need to reformat Japanese phone numbers (when user is in Japan) with the national
* dialing format.
*/
result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL); result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
} else { } else {
result = util.formatInOriginalFormat(pn, defaultCountryIso); result = util.formatInOriginalFormat(pn, defaultCountryIso);