Revert [Telephony mainline] Move the functionality about block number into the calling locations.android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100

Reason: Revisit and redesign in S

Bug: 147390517
Test: make
Change-Id: Ie6a9cf16dc2162e576f113c88ee43014c1442be8
Merged-In: Ie6a9cf16dc2162e576f113c88ee43014c1442be8
(cherry picked from commit 3307dd2d611f27482b559865586b70e8b5c038fe)

1 files changed, 2 insertions, 18 deletions

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 @@ public class SendRequest extends MmsRequest {
                         @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 @@ public class SendRequest extends MmsRequest {
                     + " 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.");
-        }
-    }
 }