commit 4ebe1c9e9ff856f06e76a69764874deff1b00ef7
author Taesu Lee <taesu82.lee@samsung.com> Wed Oct 07 16:18:45 2020 +0900
committer Shuo Qian <shuoq@google.com> Wed Oct 14 02:30:53 2020 +0000
tree b0d87c89bdb1d7bbc9e5656a3a531de8f47b2a6d
parent e74672036df6750b670654304ca157d961ef6ec5

Use TelephonyManager#isEmergencyNumber() instead

Replace deprecated PhoneNumberUtils#isEmergencyNumber() with
TelephonyManager#isEmergencyNumber().

Test: atest BlockedNumberProviderTest
Bug: 132703886
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I4961e208c5672b6f21d904ecb066773b72f67655
Merged-In: I4961e208c5672b6f21d904ecb066773b72f67655

src/com/android/providers/blockednumber/BlockedNumberProvider.java

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) {

tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java

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);