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

Commit bc2e82d4 authored by Shaopeng Jia's avatar Shaopeng Jia
Browse files

Remove explicit toUpperCase after CountryDetector is fixed to return 

uppercase region code.

Change-Id: I111d5792b67eb0e16a7278a731097f305cb9a059
parent 8909b101

telephony/java/android/telephony/PhoneNumberFormattingTextWatcher.java

+0 −3
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ public class PhoneNumberFormattingTextWatcher implements TextWatcher { 
     */

    public PhoneNumberFormattingTextWatcher(String countryCode) {

        if (countryCode == null) throw new IllegalArgumentException();

        // TODO: remove this once CountryDetector.detectCountry().getCountryIso() is fixed to always

        // return uppercase. Tracked at b/4941319.

        countryCode = countryCode.toUpperCase(Locale.ENGLISH);

        mFormatter = PhoneNumberUtil.getInstance().getAsYouTypeFormatter(countryCode);

    }

telephony/java/com/android/internal/telephony/CallerInfo.java

+0 −10
Original line number Diff line number Diff line
@@ -526,16 +526,6 @@ public class CallerInfo { 
                  + countryIso);

        }



        // Temp workaround: The current libphonenumber library requires

        // the countryIso to be uppercase (e.g. "US") but the

        // detector.detectCountry().getCountryIso() call currently returns

        // "us".  Passing "us" to util.parse() will just result in a

        // NumberParseException.

        // So force the countryIso to uppercase for now.

        // TODO: remove this once getCountryIso() is fixed to always

        // return uppercase.

        countryIso = countryIso.toUpperCase();



        PhoneNumber pn = null;

        try {

            if (VDBG) Log.v(TAG, "parsing '" + number