Snap for 5885561 from d85687e85c33a81b873d628faffff5648c7099c6 to rvc-release

Change-Id: I3d85cbbdcd43546da9837b017b73823ff8db079d
diff --git a/src/com/android/mms/service/SendRequest.java b/src/com/android/mms/service/SendRequest.java
index a130dfe..8f6790f 100644
--- a/src/com/android/mms/service/SendRequest.java
+++ b/src/com/android/mms/service/SendRequest.java
@@ -22,9 +22,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.RemoteException;
+import android.provider.BlockedNumberContract;
 import android.provider.Telephony;
 import android.service.carrier.CarrierMessagingService;
 import android.service.carrier.ICarrierMessagingService;
@@ -126,7 +128,19 @@
             for (EncodedStringValue encodedStringValue : sendReq.getTo()) {
                 if (isEmergencyNumber(encodedStringValue.getString())) {
                     LogUtil.i(getRequestId(), "Notifying emergency contact");
-                    new AsyncEmergencyContactNotifier(mContext).execute();
+                    new AsyncTask<Void, Void, Void>() {
+                        @Override
+                        protected Void doInBackground(Void... voids) {
+                            try {
+                                BlockedNumberContract.SystemContract
+                                    .notifyEmergencyContact(mContext);
+                            } catch (Exception e) {
+                                LogUtil.e(getRequestId(),
+                                    "Exception notifying emergency contact: " + e);
+                            }
+                            return null;
+                        }
+                    }.execute();
                     return;
                 }
             }