diff options
| author | Jordan Liu <jminjie@google.com> | 2020-06-08 17:46:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-08 17:46:00 +0000 |
| commit | 493f13524ec8facca62e6996e510859aa4027b00 (patch) | |
| tree | 45a6fb39f05118d8687dadf3b66be1d6c7261a12 | |
| parent | 332642ad282d4d575de7399194364bbbc6d03259 (diff) | |
| parent | 44b3590bb7e73abc176ea657eaa541dd26ce6d93 (diff) | |
| download | CellBroadcastReceiver-493f13524ec8facca62e6996e510859aa4027b00.tar.gz | |
Merge "Set package for broadcast" into rvc-dev
| -rw-r--r-- | tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java | 4 | ||||
| -rw-r--r-- | tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java index f3e8147c9..e31d79716 100644 --- a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java +++ b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java @@ -53,8 +53,8 @@ public class SendCdmaCmasMessages { private static void sendBroadcast(Activity activity, SmsCbMessage cbMessage) { Intent intent = new Intent(Telephony.Sms.Intents.ACTION_SMS_EMERGENCY_CB_RECEIVED); intent.putExtra("message", cbMessage); - CellBroadcastUtils.getDefaultCellBroadcastReceiverPackageName( - activity.getApplicationContext()); + intent.setPackage(CellBroadcastUtils.getDefaultCellBroadcastReceiverPackageName( + activity.getApplicationContext())); activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_EMERGENCY_BROADCAST, AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null); diff --git a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java index 9ac16e43b..ac8242855 100644 --- a/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java +++ b/tests/testapp/src/com/android/cellbroadcastreceiver/tests/SendGsmCmasMessages.java @@ -26,7 +26,6 @@ import android.telephony.SmsCbCmasInfo; import android.telephony.SmsCbLocation; import android.telephony.SmsCbMessage; -import android.util.Log; import com.android.internal.telephony.CellBroadcastUtils; import com.android.internal.telephony.gsm.SmsCbConstants; @@ -59,8 +58,8 @@ public class SendGsmCmasMessages { private static void sendBroadcast(Activity activity, SmsCbMessage cbMessage) { Intent intent = new Intent(Telephony.Sms.Intents.ACTION_SMS_EMERGENCY_CB_RECEIVED); intent.putExtra("message", cbMessage); - CellBroadcastUtils.getDefaultCellBroadcastReceiverPackageName( - activity.getApplicationContext()); + intent.setPackage(CellBroadcastUtils.getDefaultCellBroadcastReceiverPackageName( + activity.getApplicationContext())); activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_EMERGENCY_BROADCAST, AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null); |