commit f2dcd80c3567a9bf34133873469108d5e3e049e7
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 12 06:38:57 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 12 06:38:57 2020 +0000
tree b46d585fa895c0a2c3cab6e462e8ae26d9d4ee0f
parent 3c8aa7b586b7e603ac99c8e4f0a9e4adf06cd034
parent 608143e5f38a3c288f21f9031bbe28e143914919

Revert [Telephony mainline] Move the functionality about block number into the calling locations. am: 608143e5f3

Change-Id: I1b32ea191ebd6a1f611032aac2ea2c58e3e8a17c

src/com/android/mms/service/SendRequest.java

diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index ebbfd6c..e4d1d55 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -130,7 +130,8 @@
                         @Override
                         protected Void doInBackground(Void... voids) {
                             try {
-                                notifyEmergencyContact(mContext);
+                                BlockedNumberContract.SystemContract
+                                        .notifyEmergencyContact(mContext);
                             } catch (Exception e) {
                                 LogUtil.e(getRequestId(),
                                     "Exception notifying emergency contact. messageId: "
@@ -460,21 +461,4 @@
                     + " with result: " + result);
         }
     }
-
-    /**
-     * Notifies the provider that emergency services were contacted by the user.
-     */
-    private void notifyEmergencyContact(Context context) {
-        try {
-            LogUtil.i("notifyEmergencyContact; caller=%s", context.getOpPackageName());
-            context.getContentResolver().call(
-                    BlockedNumberContract.AUTHORITY_URI,
-                    BlockedNumberContract.METHOD_NOTIFY_EMERGENCY_CONTACT,
-                    null, null);
-        } catch (NullPointerException | IllegalArgumentException ex) {
-            // The content resolver can throw an NPE or IAE; we don't want to crash Telecom if
-            // either of these happen.
-            LogUtil.w(null, "notifyEmergencyContact: provider not ready.");
-        }
-    }
 }