diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-11 17:31:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 17:31:44 +0000 |
| commit | d2eb366490c9cff74d39c20eda484c05d2065dd1 (patch) | |
| tree | 61a6b105ad082b0816e25a1503d4a77d39457de1 | |
| parent | 3a184aa4f982905c101258255e7e516fc6727042 (diff) | |
| parent | a281046577d089ed076e0aa21dd8b9b7712b42b7 (diff) | |
| download | ims-d2eb366490c9cff74d39c20eda484c05d2065dd1.tar.gz | |
Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: a281046577
Original change: https://android-review.googlesource.com/c/platform/external/ims/+/1702032
Change-Id: Ibb3c11c7bef069dcde89920259e14bac75b70bca
| -rw-r--r-- | rcs/rcsmanager/src/java/com/android/ims/internal/ContactNumberUtils.java | 15 |
1 files 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)) { |