From d6e27ad8c22624d6eee53cbc381ecdb74251c06d Mon Sep 17 00:00:00 2001 From: Shuo Qian Date: Mon, 10 May 2021 22:54:23 +0000 Subject: Revert "Use TelephonyManager#isEmergencyNumber() instead" Revert submission 1453740-replace_with_isEmergencyNumber Reason for revert: Change-Id: I879edfacddf86b252ee60b7833369b30cb1df9f1 Bug: 132703886 --- .../java/com/android/ims/internal/ContactNumberUtils.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/rcs/rcsmanager/src/java/com/android/ims/internal/ContactNumberUtils.java b/rcs/rcsmanager/src/java/com/android/ims/internal/ContactNumberUtils.java index 094afb4..1ed03f9 100644 --- a/rcs/rcsmanager/src/java/com/android/ims/internal/ContactNumberUtils.java +++ b/rcs/rcsmanager/src/java/com/android/ims/internal/ContactNumberUtils.java @@ -134,9 +134,7 @@ public class ContactNumberUtils { public static int NUMBER_INVALID = 5; /** - * Check if it is a valid contact number for presence. - * - * Note: mContext must be set via setContext() before calling this method. + * Check if it is a valid contact number for presence * * @param phoneNumber read from contact db. * @return contact number error code. @@ -163,16 +161,7 @@ public class ContactNumberUtils { return NUMBER_INVALID; } - boolean isEmergencyNumber; - if (mContext == null) { - Log.e(TAG, "context is unexpectedly null to provide emergency identification service"); - isEmergencyNumber = false; - } else { - TelephonyManager tm = mContext.getSystemService(TelephonyManager.class); - isEmergencyNumber = tm.isEmergencyNumber(number); - } - - if (isEmergencyNumber) { + if (PhoneNumberUtils.isEmergencyNumber(number)) { return NUMBER_EMERGENCY; // TODO: To handle short code //} else if ((mContext != null) && PhoneNumberUtils.isN11Number(mContext, number)) { -- cgit v1.2.3