am c4809bcf: am 8750f04a: am a14e9001: Merge "Reformat only KR numbers with leading "+82"." into mnc-dr-dev

* commit 'c4809bcfa72f2f4eb4f03cb4b86dbb864cc01147':
  Reformat only KR numbers with leading "+82".
This commit is contained in:
Roshan Pius
2015-09-03 06:20:53 +00:00
committed by Android Git Automerger

View File

@@ -1457,10 +1457,15 @@ 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) &&
(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.
(pn.getCountryCode() == util.getCountryCodeForRegion(KOREA_ISO_COUNTRY_CODE)) &&
(pn.getCountryCodeSource() ==
PhoneNumber.CountryCodeSource.FROM_NUMBER_WITH_PLUS_SIGN)) {
result = util.format(pn, PhoneNumberUtil.PhoneNumberFormat.NATIONAL);
} else {
result = util.formatInOriginalFormat(pn, defaultCountryIso);