diff --git a/src/com/android/providers/blockednumber/BlockedNumberProvider.java b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
index 1458c1c..9adf15e 100644
--- a/src/com/android/providers/blockednumber/BlockedNumberProvider.java
+++ b/src/com/android/providers/blockednumber/BlockedNumberProvider.java
@@ -45,7 +45,6 @@
 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;
@@ -407,9 +406,10 @@
             return false;
         }
 
-        final String e164Number = Utils.getE164Number(getContext(), phoneNumber, null);
-        return PhoneNumberUtils.isEmergencyNumber(phoneNumber)
-                || PhoneNumberUtils.isEmergencyNumber(e164Number);
+        Context context = getContext();
+        final String e164Number = Utils.getE164Number(context, phoneNumber, null);
+        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
+        return tm.isEmergencyNumber(phoneNumber) || tm.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 8b5e82b..ed48070 100644
--- a/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
+++ b/tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java
@@ -608,6 +608,7 @@
 
     public void testEmergencyNumbersAreNotBlockedBySystem() {
         String emergencyNumber = getEmergencyNumberFromSystemPropertiesOrDefault();
+        doReturn(true).when(mMockContext.mTelephonyManager).isEmergencyNumber(emergencyNumber);
         insert(cv(BlockedNumbers.COLUMN_ORIGINAL_NUMBER, emergencyNumber));
 
         assertIsBlocked(true, emergencyNumber);
