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

Merge "Modify the deprecation of PhoneNumberUtil isEmergencyNumber" am: b8c7afacec

Browse Source 
am: 4362b01d2c

Change-Id: I74e90fc150b6928e244a35aabeb865b6ad521810
This commit is contained in:
Shuo Qian
2019-04-03 16:15:05 -07:00
committed by android-build-merger
parent cb6605192c 4362b01d2c
commit 47fdabe9fa
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2016,7 +2016,16 @@ public class PhoneNumberUtils {
private static boolean isEmergencyNumberInternal(int subId, String number,
String defaultCountryIso,
boolean useExactMatch) {
return TelephonyManager.getDefault().isEmergencyNumber(number);
try {
if (useExactMatch) {
return TelephonyManager.getDefault().isEmergencyNumber(number);
} else {
return TelephonyManager.getDefault().isPotentialEmergencyNumber(number);
}
} catch (RuntimeException ex) {
Rlog.e(LOG_TAG, "isEmergencyNumberInternal: RuntimeException: " + ex);
}
return false;
}
/**