From 01e04118e0dc3193b7317afc9327a0177c5f1804 Mon Sep 17 00:00:00 2001
From: Shuo Qian <shuoq@google.com>
Date: Mon, 10 May 2021 22:54:23 +0000
Subject: Revert "Use TelephonyManager#isEmergencyNumber() instead"

Revert submission 1453740-replace_with_isEmergencyNumber

Reason for revert: <Telephony service may not up while calling this, causing failures.>

Change-Id: Id0fd5969132e8e661aeca4b7a175b6c69a508aa8
Bug: 132703886
---
 .../android/providers/blockednumber/BlockedNumberProvider.java    | 8 ++++----
 .../providers/blockednumber/BlockedNumberProviderTest.java        | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index 9adf15e..1458c1c 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -45,6 +45,7 @@ import android.provider.BlockedNumberContract;
 import android.provider.BlockedNumberContract.SystemContract;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -406,10 +407,9 @@ public class BlockedNumberProvider extends ContentProvider {
             return false;
         }
 
-        Context context = getContext();
-        final String e164Number = Utils.getE164Number(context, phoneNumber, null);
-        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
-        return tm.isEmergencyNumber(phoneNumber) || tm.isEmergencyNumber(e164Number);
+        final String e164Number = Utils.getE164Number(getContext(), phoneNumber, null);
+        return PhoneNumberUtils.isEmergencyNumber(phoneNumber)
+                || PhoneNumberUtils.isEmergencyNumber(e164Number);
     }
 
     private boolean isBlocked(String phoneNumber) {
diff --git a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
index ed48070..8b5e82b 100644
--- a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
+++ b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
@@ -608,7 +608,6 @@ public class BlockedNumberProviderTest extends AndroidTestCase {
 
     public void testEmergencyNumbersAreNotBlockedBySystem() {
         String emergencyNumber = getEmergencyNumberFromSystemPropertiesOrDefault();
-        doReturn(true).when(mMockContext.mTelephonyManager).isEmergencyNumber(emergencyNumber);
         insert(cv(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, emergencyNumber));
 
         assertIsBlocked(true, emergencyNumber);
-- 
cgit v1.2.3