Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up usage of CountryDetector in PhoneNumberUtils"

Browse Source 
am: 7790a36021

Change-Id: Ibeba94473ac0ed4998b70dd51b86adc53c1b37b7
This commit is contained in:
Hall Liu
2020-01-21 17:09:00 -08:00
committed by android-build-merger
parent f0a2e25c9f 7790a36021
commit ae9f596078
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -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);
} }
/** /**