commit 20ea0d453647812b6aef981af279c1064f4f0a5c
author Zoey Chen <zoeychen@google.com> Fri Mar 06 06:38:15 2020 +0000
committer Zoey Chen <zoeychen@google.com> Wed Mar 11 08:24:30 2020 +0000
tree 2cbde49298a1dad925232e28441dcca3dc2c36da
parent 975c171cc8e892f6e503575126d4b5cda039ba14

Revert "[Telephony Mainline] 1. Move the functionality about blo..."

Revert "[Telephony mainline] Move all METHOD_* constants from Sy..."

Revert "[Telephony mainline] Move the functionality into the cal..."

Revert submission 1175092-1575532679259-3b86bd03

Reason for revert: <Revisit and redesign in S>
Reverted Changes:
I5c4380f93:[Telephony mainline] Move all METHOD_* constants f...
I84bbfc13c:[Telephony mainline] Move METHOD_* constants from ...
I5a53cb416:[Telephony mainline] Move the functionality into t...
I69d1fd77c:[Telephony Mainline] 1. Move the functionality abo...
I619d6ba04:[Telephony mainline] Add SystemApi and NonNull ann...

Change-Id: Id29d692da30a1ace3ab941517b7ad85c5c7ec259
Merged-In: Ie6a9cf16dc2162e576f113c88ee43014c1442be8

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 fefbbc0..8446646 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -127,7 +127,8 @@
                         @Override
                         protected Void doInBackground(Void... voids) {
                             try {
-                                notifyEmergencyContact(mContext);
+                                BlockedNumberContract.SystemContract
+                                    .notifyEmergencyContact(mContext);
                             } catch (Exception e) {
                                 LogUtil.e(getRequestId(),
                                     "Exception notifying emergency contact: " + e);
@@ -446,21 +447,4 @@
             LogUtil.e("Unexpected onDownloadMmsComplete call 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.");
-        }
-    }
 }