diff options
| author | Taesu Lee <taesu82.lee@samsung.com> | 2020-10-07 16:18:45 +0900 |
|---|---|---|
| committer | Shuo Qian <shuoq@google.com> | 2020-10-13 15:54:29 -0700 |
| commit | db1885e1f19b901d07274b4cd1e06383b7438a0a (patch) | |
| tree | b0d87c89bdb1d7bbc9e5656a3a531de8f47b2a6d | |
| parent | 4520ae32f6650a843c3ea7747b681477fbfd4aac (diff) | |
| download | BlockedNumberProvider-db1885e1f19b901d07274b4cd1e06383b7438a0a.tar.gz | |
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
| -rw-r--r-- | src/com/android/providers/blockednumber/BlockedNumberProvider.java | 8 | ||||
| -rw-r--r-- | tests/src/com/android/providers/blockednumber/BlockedNumberProviderTest.java | 1 |
2 files changed, 5 insertions, 4 deletions
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; 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 @@ public class BlockedNumberProvider extends ContentProvider { 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 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); |