Merge "Update CellBroadcastIntents API"
am: 6ec1a35516
Change-Id: Id2511ea6d3a465f3afd4d16d938b5fb2765ecd66
diff --git a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
index 21eeae6..e8e19c1 100644
--- a/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
+++ b/src/com/android/cellbroadcastservice/CellBroadcastHandler.java
@@ -518,18 +518,13 @@
mLocalLog.log(msg);
// Send implicit intent since there are various 3rd party carrier apps listen to
// this intent.
- intent = new Intent(Telephony.Sms.Intents.SMS_CB_RECEIVED_ACTION);
receiverPermission = Manifest.permission.RECEIVE_SMS;
appOp = AppOpsManager.OPSTR_RECEIVE_SMS;
- intent.putExtra(EXTRA_MESSAGE, message);
- putPhoneIdAndSubIdExtra(mContext, intent, slotIndex);
-
mReceiverCount.incrementAndGet();
- CellBroadcastIntents.sendOrderedBroadcastForBackgroundReceivers(
- mContext, UserHandle.ALL, intent,
- receiverPermission, appOp, mReceiver, getHandler(), Activity.RESULT_OK,
- null, null);
+ CellBroadcastIntents.sendSmsCbReceivedBroadcast(
+ mContext, UserHandle.ALL, message, mReceiver, getHandler(), Activity.RESULT_OK,
+ slotIndex);
}
if (messageUri != null) {