Revert "Use TelephonyManager#isEmergencyNumber() instead"
Revert submission 1453740-replace_with_isEmergencyNumber
Reason for revert: <Telephony service may not up while calling this, causing failures.>
This also cherry picks ag/14444738
Change-Id: I5aa71917ce1b2abcdfcf78b8988d128982a6b3ec
Bug: 132703886
Bug: 181062609
Bug: 187720309
Merged-In: I5df03a61f55f863e17594aa3239433a5048a4890
diff --git a/telecomm/java/android/telecom/CallerInfo.java b/telecomm/java/android/telecom/CallerInfo.java
index aff2f01..fb6f994 100644
--- a/telecomm/java/android/telecom/CallerInfo.java
+++ b/telecomm/java/android/telecom/CallerInfo.java
@@ -405,8 +405,7 @@
// Change the callerInfo number ONLY if it is an emergency number
// or if it is the voicemail number. If it is either, take a
// shortcut and skip the query.
- TelephonyManager tm = context.getSystemService(TelephonyManager.class);
- if (tm.isEmergencyNumber(number)) {
+ if (PhoneNumberUtils.isLocalEmergencyNumber(context, number)) {
return new CallerInfo().markAsEmergency(context);
} else if (PhoneNumberUtils.isVoiceMailNumber(null, subId, number)) {
return new CallerInfo().markAsVoiceMail(context, subId);