am fc3b7d01: am 26f398e2: Added multi-sim support to the test app.

* commit 'fc3b7d01ac4c3602d046ef6cfe6a4c770dd5fbbc':
  Added multi-sim support to the test app.

3 files changed, 81 insertions, 58 deletions

diff --git a/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java b/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
index 8aa71061..3605606a 100644
--- a/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
+++ b/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
@@ -20,24 +20,13 @@ import android.Manifest;
 import android.app.Activity;
 import android.app.AppOpsManager;
 import android.content.Intent;
-import android.os.Parcel;
 import android.os.UserHandle;
 import android.provider.Telephony;
 import android.telephony.SmsCbCmasInfo;
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
-import android.test.AndroidTestCase;
-import android.util.Log;
-
-import com.android.internal.telephony.GsmAlphabet;
-import com.android.internal.telephony.cdma.sms.BearerData;
-import com.android.internal.telephony.cdma.sms.CdmaSmsAddress;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.cdma.sms.SmsEnvelope;
-import com.android.internal.telephony.cdma.sms.UserData;
-import com.android.internal.util.BitwiseOutputStream;
-
-import java.util.Arrays;
-import java.util.Random;
 
 /**
  * Send some test CDMA CMAS warning notifications.
@@ -64,7 +53,7 @@ public class SendCdmaCmasMessages {
 
     private static final String IS91_TEXT = "IS91 SHORT MSG";   // max length 14 chars
 
-    public static void testSendCmasPresAlert(Activity activity, int messageId) {
+    public static void testSendCmasPresAlert(Activity activity, int messageId, int subId) {
         SmsCbMessage cbMessage = createCmasSmsMessage(
                 SmsEnvelope.SERVICE_CATEGORY_CMAS_PRESIDENTIAL_LEVEL_ALERT, messageId, "en",
                 PRES_ALERT, SmsCbCmasInfo.CMAS_CATEGORY_GEO,
@@ -73,12 +62,13 @@ public class SendCdmaCmasMessages {
 
         Intent intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", cbMessage);
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendCmasExtremeAlert(Activity activity, int messageId) {
+    public static void testSendCmasExtremeAlert(Activity activity, int messageId, int subId) {
         SmsCbMessage cbMessage = createCmasSmsMessage(
                 SmsEnvelope.SERVICE_CATEGORY_CMAS_EXTREME_THREAT, messageId, "en",
                 EXTREME_ALERT, SmsCbCmasInfo.CMAS_CATEGORY_MET,
@@ -87,12 +77,13 @@ public class SendCdmaCmasMessages {
 
         Intent intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", cbMessage);
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendCmasSevereAlert(Activity activity, int messageId) {
+    public static void testSendCmasSevereAlert(Activity activity, int messageId, int subId) {
         SmsCbMessage cbMessage = createCmasSmsMessage(
                 SmsEnvelope.SERVICE_CATEGORY_CMAS_SEVERE_THREAT, messageId, "en",
                 SEVERE_ALERT, SmsCbCmasInfo.CMAS_CATEGORY_HEALTH,
@@ -101,12 +92,13 @@ public class SendCdmaCmasMessages {
 
         Intent intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", cbMessage);
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendCmasAmberAlert(Activity activity, int messageId) {
+    public static void testSendCmasAmberAlert(Activity activity, int messageId, int subId) {
         SmsCbMessage cbMessage = createCmasSmsMessage(
                 SmsEnvelope.SERVICE_CATEGORY_CMAS_CHILD_ABDUCTION_EMERGENCY, messageId, "en",
                 AMBER_ALERT, SmsCbCmasInfo.CMAS_CATEGORY_UNKNOWN,
@@ -115,12 +107,13 @@ public class SendCdmaCmasMessages {
 
         Intent intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", cbMessage);
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendCmasMonthlyTest(Activity activity, int messageId) {
+    public static void testSendCmasMonthlyTest(Activity activity, int messageId, int subId) {
         SmsCbMessage cbMessage = createCmasSmsMessage(
                 SmsEnvelope.SERVICE_CATEGORY_CMAS_TEST_MESSAGE, messageId, "en",
                 MONTHLY_TEST_ALERT, SmsCbCmasInfo.CMAS_CATEGORY_UNKNOWN,
@@ -129,6 +122,7 @@ public class SendCdmaCmasMessages {
 
         Intent intent = new Intent(Telephony.Sms.Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", cbMessage);
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
@@ -185,4 +179,4 @@ public class SendCdmaCmasMessages {
                 return SmsCbCmasInfo.CMAS_CLASS_UNKNOWN;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java
index ca5a2a01..1977f38f 100644
--- a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java
+++ b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestBroadcastActivity.java
@@ -20,6 +20,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.telephony.SubscriptionManager;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -41,6 +42,9 @@ public class SendTestBroadcastActivity extends Activity {
     /** Delay time before sending test message (when box is checked). */
     private static final int DELAY_BEFORE_SENDING_MSEC = 5000;
 
+    /** Subscription index for multi SIM support */
+    private int mSubId = 0;
+
     private final Handler mDelayHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -91,6 +95,9 @@ public class SendTestBroadcastActivity extends Activity {
 
         setContentView(R.layout.test_buttons);
 
+        /* Retrieve the default sub id */
+        mSubId = SubscriptionManager.getDefaultSubId();
+
         /* Set message ID to a random value from 1-65535. */
         EditText messageIdField = (EditText) findViewById(R.id.message_id);
         messageIdField.setText(String.valueOf(new Random().nextInt(65535) + 1));
@@ -108,7 +115,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendEtwsMessageNormal(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -122,7 +129,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendEtwsMessageCancel(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -136,7 +143,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendEtwsMessageTest(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -150,7 +157,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendCdmaCmasMessages.testSendCmasPresAlert(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -164,7 +171,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendCdmaCmasMessages.testSendCmasExtremeAlert(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -178,7 +185,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendCdmaCmasMessages.testSendCmasSevereAlert(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -192,7 +199,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendCdmaCmasMessages.testSendCmasAmberAlert(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -206,7 +213,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendCdmaCmasMessages.testSendCmasMonthlyTest(SendTestBroadcastActivity.this,
-                            getMessageId());
+                            getMessageId(), mSubId);
                 }
             }
         });
@@ -220,7 +227,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bit(SendTestBroadcastActivity.this,
-                            getMessageId(), getCategory());
+                            getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -234,7 +241,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitUmts(SendTestBroadcastActivity.this,
-                            getMessageId(), getCategory());
+                            getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -248,7 +255,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitNoPadding(SendTestBroadcastActivity.this,
-                            getMessageId(), getCategory());
+                            getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -263,7 +270,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitNoPaddingUmts(
-                            SendTestBroadcastActivity.this, getMessageId(), getCategory());
+                            SendTestBroadcastActivity.this, getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -278,7 +285,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitMultipageGsm(SendTestBroadcastActivity.this,
-                            getMessageId(), getCategory());
+                            getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -293,7 +300,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitMultipageUmts(
-                            SendTestBroadcastActivity.this, getMessageId(), getCategory());
+                            SendTestBroadcastActivity.this, getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -308,7 +315,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitWithLanguage(SendTestBroadcastActivity.this,
-                            getMessageId(), getCategory());
+                            getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -323,7 +330,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitWithLanguageInBody(
-                            SendTestBroadcastActivity.this, getMessageId(), getCategory());
+                            SendTestBroadcastActivity.this, getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -338,7 +345,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessage7bitWithLanguageInBodyUmts(
-                            SendTestBroadcastActivity.this, getMessageId(), getCategory());
+                            SendTestBroadcastActivity.this, getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -352,7 +359,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessageUcs2(SendTestBroadcastActivity.this,
-                            getMessageId(), getCategory());
+                            getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -366,7 +373,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessageUcs2Umts(SendTestBroadcastActivity.this,
-                            getMessageId(), getCategory());
+                            getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -381,7 +388,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessageUcs2MultipageUmts(
-                            SendTestBroadcastActivity.this, getMessageId(), getCategory());
+                            SendTestBroadcastActivity.this, getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -396,7 +403,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessageUcs2WithLanguageInBody(
-                            SendTestBroadcastActivity.this, getMessageId(), getCategory());
+                            SendTestBroadcastActivity.this, getMessageId(), getCategory(), mSubId);
                 }
             }
         });
@@ -411,7 +418,7 @@ public class SendTestBroadcastActivity extends Activity {
                     mDelayHandler.sendMessageDelayed(msg, DELAY_BEFORE_SENDING_MSEC);
                 } else {
                     SendTestMessages.testSendMessageUcs2WithLanguageUmts(
-                            SendTestBroadcastActivity.this, getMessageId(), getCategory());
+                            SendTestBroadcastActivity.this, getMessageId(), getCategory(), mSubId);
                 }
             }
         });
diff --git a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java
index 11d562bf..ca91c9a0 100644
--- a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java
+++ b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java
@@ -25,6 +25,7 @@ import android.provider.Telephony.Sms.Intents;
 import android.telephony.SmsCbLocation;
 import android.telephony.SmsCbMessage;
 import android.util.Log;
+import com.android.internal.telephony.PhoneConstants;
 
 import com.android.internal.telephony.EncodeException;
 import com.android.internal.telephony.GsmAlphabet;
@@ -425,142 +426,163 @@ public class SendTestMessages {
         }
     }
 
-    public static void testSendMessage7bit(Activity activity, int serialNumber, int category) {
+    public static void testSendMessage7bit(Activity activity, int serialNumber,
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTest, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendMessage7bitUmts(Activity activity, int serialNumber, int category) {
+    public static void testSendMessage7bitUmts(Activity activity, int serialNumber,
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTestUmts, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessage7bitNoPadding(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTestNoPadding, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessage7bitNoPaddingUmts(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTestNoPaddingUmts, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessage7bitMultipageGsm(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         byte[][] pdus = new byte[2][];
         pdus[0] = gsm7BitTestMultipage1;
         pdus[1] = gsm7BitTestMultipage2;
         intent.putExtra("message", createFromPdus(pdus, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessage7bitMultipageUmts(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTestMultipageUmts, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessage7bitWithLanguage(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTestWithLanguage, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessage7bitWithLanguageInBody(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTestWithLanguageInBody, serialNumber,
                 category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessage7bitWithLanguageInBodyUmts(Activity activity,
-            int serialNumber, int category) {
+            int serialNumber, int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsm7BitTestWithLanguageInBodyUmts, serialNumber,
                 category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendMessageUcs2(Activity activity, int serialNumber, int category) {
+    public static void testSendMessageUcs2(Activity activity, int serialNumber,
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsmUcs2Test, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendMessageUcs2Umts(Activity activity, int serialNumber, int category) {
+    public static void testSendMessageUcs2Umts(Activity activity, int serialNumber,
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsmUcs2TestUmts, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessageUcs2MultipageUmts(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsmUcs2TestMultipageUmts, serialNumber, category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessageUcs2WithLanguageInBody(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsmUcs2TestWithLanguageInBody, serialNumber,
                 category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
     public static void testSendMessageUcs2WithLanguageUmts(Activity activity, int serialNumber,
-            int category) {
+            int category, int subId) {
         Intent intent = new Intent(Intents.SMS_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(gsmUcs2TestWithLanguageInBodyUmts, serialNumber,
                 category));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL, Manifest.permission.RECEIVE_SMS,
                 AppOpsManager.OP_RECEIVE_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendEtwsMessageNormal(Activity activity, int serialNumber) {
+    public static void testSendEtwsMessageNormal(Activity activity, int serialNumber, int subId) {
         Intent intent = new Intent(Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(etwsMessageNormal, serialNumber, 0));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendEtwsMessageCancel(Activity activity, int serialNumber) {
+    public static void testSendEtwsMessageCancel(Activity activity, int serialNumber, int subId) {
         Intent intent = new Intent(Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(etwsMessageCancel, serialNumber, 0));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
     }
 
-    public static void testSendEtwsMessageTest(Activity activity, int serialNumber) {
+    public static void testSendEtwsMessageTest(Activity activity, int serialNumber, int subId) {
         Intent intent = new Intent(Intents.SMS_EMERGENCY_CB_RECEIVED_ACTION);
         intent.putExtra("message", createFromPdu(etwsMessageTest, serialNumber, 0));
+        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
         activity.sendOrderedBroadcastAsUser(intent, UserHandle.ALL,
                 Manifest.permission.RECEIVE_EMERGENCY_BROADCAST,
                 AppOpsManager.OP_RECEIVE_EMERGECY_SMS, null, null, Activity.RESULT_OK, null, null);
     }
-}
+}
\ No newline at end of file