Merge "Do not allow SMS event receivers to abort the broadcast" into klp-devandroid-cts-4.4_r1kitkat-cts-dev

1 files changed, 1 insertions, 0 deletions

diff --git a/src/java/com/android/internal/telephony/InboundSmsHandler.java b/src/java/com/android/internal/telephony/InboundSmsHandler.java
index 3eb77cfe61..4288fcc3c8 100644
--- a/src/java/com/android/internal/telephony/InboundSmsHandler.java
+++ b/src/java/com/android/internal/telephony/InboundSmsHandler.java
@@ -661,6 +661,7 @@ public abstract class InboundSmsHandler extends StateMachine {
      */
     void dispatchIntent(Intent intent, String permission, int appOp,
             BroadcastReceiver resultReceiver) {
+        intent.addFlags(Intent.FLAG_RECEIVER_NO_ABORT);
         mContext.sendOrderedBroadcast(intent, permission, appOp, resultReceiver,
                 getHandler(), Activity.RESULT_OK, null, null);
     }