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 
am: 050e5ddb4f

Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b
This commit is contained in:
Tyler Gunn
2017-02-27 02:54:49 +00:00
committed by android-build-merger
parent 82c46d11f6 050e5ddb4f
commit 8ac499fbe6
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1140,6 +1140,8 @@ public class PhoneNumberUtils
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
* for the country the number is from.
@@ -1460,15 +1462,25 @@ public class PhoneNumberUtils
String result = null;
try {
PhoneNumber pn = util.parseAndKeepRawInput(phoneNumber, defaultCountryIso);
/**
* 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
* +82 with 0.
*/
if (KOREA_ISO_COUNTRY_CODE.equals(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
* country code to corresponding national format which would replace the leading
* +82 with 0.
*/
result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
} else if (JAPAN_ISO_COUNTRY_CODE.equalsIgnoreCase(defaultCountryIso) &&
pn.getCountryCode() == util.getCountryCodeForRegion(JAPAN_ISO_COUNTRY_CODE) &&
(pn.getCountryCodeSource() ==
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);
} else {
result = util.formatInOriginalFormat(pn, defaultCountryIso);