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

Commit 3b8f62b6 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Format Japanese numbers using national format when in Japan. 

Similar to the like change for Korean phone numbers, ensure that when the
user is in Japan, Japanese phone numbers are formatted using the national
format rather than the international format.

Test: Unit
Bug: 27090466
Change-Id: I3487eea9fddbe7ee15c03da3f03d53f9dcea0834
parent 8fbf6a29

telephony/java/android/telephony/PhoneNumberUtils.java

+18 −6
Original line number Diff line number Diff line
@@ -1139,6 +1139,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.
@@ -1459,15 +1461,25 @@ public class PhoneNumberUtils 
        String result = null;

        try {

            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

                 * 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)) &&

                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);