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

Commit b49a3aff authored by Hall Liu's avatar Hall Liu
Browse files

Clean up usage of CountryDetector in PhoneNumberUtils 

PhoneNumberUtils calls CountryDetector methods to ascertain whether a
number is an emergency number in the current country, but recent
emergency number detection changes have made the country an unused
parameter. Remove calls to CountryDetector to satisfy mainline
requirements wrt hidden APIs.

Fixes: 148087591
Test: atest PhoneNumberUtilsTest
Change-Id: Ib6ef6348cb1c50e89e24f4f67de6ce76d87550cd
parent feaed689

telephony/java/android/telephony/PhoneNumberUtils.java

+2 −13
Original line number Original line Diff line number Diff line
@@ -28,7 +28,6 @@ import android.content.Context; 
import android.content.Intent;

import android.content.Intent;

import android.content.res.Resources;

import android.content.res.Resources;

import android.database.Cursor;

import android.database.Cursor;

import android.location.CountryDetector;

import android.net.Uri;

import android.net.Uri;

import android.os.PersistableBundle;

import android.os.PersistableBundle;

import android.provider.Contacts;

import android.provider.Contacts;
@@ -2032,6 +2031,7 @@ public class PhoneNumberUtils { 
    private static boolean isEmergencyNumberInternal(int subId, String number,

    private static boolean isEmergencyNumberInternal(int subId, String number,

                                                     String defaultCountryIso,

                                                     String defaultCountryIso,

                                                     boolean useExactMatch) {

                                                     boolean useExactMatch) {

        // TODO: clean up all the callers that pass in a defaultCountryIso, since it's ignored now.

        try {

        try {

            if (useExactMatch) {

            if (useExactMatch) {

                return TelephonyManager.getDefault().isEmergencyNumber(number);

                return TelephonyManager.getDefault().isEmergencyNumber(number);
@@ -2193,18 +2193,7 @@ public class PhoneNumberUtils { 
    private static boolean isLocalEmergencyNumberInternal(int subId, String number,

    private static boolean isLocalEmergencyNumberInternal(int subId, String number,

                                                          Context context,

                                                          Context context,

                                                          boolean useExactMatch) {

                                                          boolean useExactMatch) {

        String countryIso;

        return isEmergencyNumberInternal(subId, number, null /* unused */, useExactMatch);

        CountryDetector detector = (CountryDetector) context.getSystemService(

                Context.COUNTRY_DETECTOR);

        if (detector != null && detector.detectCountry() != null) {

            countryIso = detector.detectCountry().getCountryIso();

        } else {

            Locale locale = context.getResources().getConfiguration().locale;

            countryIso = locale.getCountry();

            Rlog.w(LOG_TAG, "No CountryDetector; falling back to countryIso based on locale: "

                    + countryIso);

        }

        return isEmergencyNumberInternal(subId, number, countryIso, useExactMatch);

    }

    }





    /**

    /**