Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8750f04a authored by Roshan Pius's avatar Roshan Pius Committed by Android Git Automerger
Browse files

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

* commit 'a14e9001':
  Reformat only KR numbers with leading "+82".
parents 9e30e202 a14e9001
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -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);