Change subId to int from long

Change-Id: Idae6335e63e7b1e4e714bc17e71b1a4705e38474

22 files changed, 72 insertions, 72 deletions

diff --git a/src/com/android/mms/data/Conversation.java b/src/com/android/mms/data/Conversation.java
index 4a711307..c18d5131 100755
--- a/src/com/android/mms/data/Conversation.java
+++ b/src/com/android/mms/data/Conversation.java
@@ -328,7 +328,7 @@ public class Conversation {
                     LogTag.debug("sendReadReport: uri = " + uri);
                 }
                 MmsMessageSender.sendReadRec(context, AddressUtils.getFrom(context, uri),
-                                             c.getString(1), status, c.getLong(2));
+                                             c.getString(1), status, c.getInt(2));
             }
         } finally {
             if (c != null) {
diff --git a/src/com/android/mms/data/WorkingMessage.java b/src/com/android/mms/data/WorkingMessage.java
index 2abb6f26..62052116 100755
--- a/src/com/android/mms/data/WorkingMessage.java
+++ b/src/com/android/mms/data/WorkingMessage.java
@@ -1174,7 +1174,7 @@ public class WorkingMessage {
      * @throws ContentRestrictionException if sending an MMS and uaProfUrl is not defined
      * in mms_config.xml.
      */
-    public void send(final String recipientsInUI, final long subId) {
+    public void send(final String recipientsInUI, final int subId) {
         long origThreadId = mConversation.getThreadId();
 
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
@@ -1282,7 +1282,7 @@ public class WorkingMessage {
 
     // Message sending stuff
 
-    private void preSendSmsWorker(Conversation conv, String msgText, String recipientsInUI, long subId) {
+    private void preSendSmsWorker(Conversation conv, String msgText, String recipientsInUI, int subId) {
         // If user tries to send the message, it's a signal the inputted text is what they wanted.
         UserHappinessSignals.userAcceptedImeText(mActivity);
 
@@ -1321,7 +1321,7 @@ public class WorkingMessage {
         }
     }
 
-    private void sendSmsWorker(String msgText, String semiSepRecipients, long threadId, long subId) {
+    private void sendSmsWorker(String msgText, String semiSepRecipients, long threadId, int subId) {
         String[] dests = TextUtils.split(semiSepRecipients, ";");
         if (LogTag.VERBOSE || Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
             Log.d(LogTag.TRANSACTION, "sendSmsWorker sending message: recipients=" +
@@ -1343,7 +1343,7 @@ public class WorkingMessage {
 
     private void sendMmsWorker(Conversation conv, Uri mmsUri, PduPersister persister,
             SlideshowModel slideshow,
-            SendReq sendReq, boolean textOnly, long subId) {
+            SendReq sendReq, boolean textOnly, int subId) {
         long threadId = 0;
         Cursor cursor = null;
         boolean newMessage = false;
@@ -1476,7 +1476,7 @@ public class WorkingMessage {
         MmsWidgetProvider.notifyDatasetChanged(mActivity);
     }
 
-    private void markMmsMessageWithError(Uri mmsUri, long subId) {
+    private void markMmsMessageWithError(Uri mmsUri, int subId) {
         try {
             PduPersister p = PduPersister.getPduPersister(mActivity);
             // Move the message into MMS Outbox. A trigger will create an entry in
diff --git a/src/com/android/mms/transaction/MmsMessageSender.java b/src/com/android/mms/transaction/MmsMessageSender.java
index 6339a9f0..19dfd440 100755
--- a/src/com/android/mms/transaction/MmsMessageSender.java
+++ b/src/com/android/mms/transaction/MmsMessageSender.java
@@ -50,7 +50,7 @@ public class MmsMessageSender implements MessageSender {
     private final Context mContext;
     private final Uri mMessageUri;
     private final long mMessageSize;
-    private final long mSubId;
+    private final int mSubId;
 
     // Default preference values
     private static final boolean DEFAULT_DELIVERY_REPORT_MODE  = false;
@@ -59,7 +59,7 @@ public class MmsMessageSender implements MessageSender {
     private static final int     DEFAULT_PRIORITY        = PduHeaders.PRIORITY_NORMAL;
     private static final String  DEFAULT_MESSAGE_CLASS   = PduHeaders.MESSAGE_CLASS_PERSONAL_STR;
 
-    public MmsMessageSender(Context context, Uri location, long messageSize, long subId) {
+    public MmsMessageSender(Context context, Uri location, long messageSize, int subId) {
         mContext = context;
         mMessageUri = location;
         mMessageSize = messageSize;
@@ -155,7 +155,7 @@ public class MmsMessageSender implements MessageSender {
         sendReq.setReadReport(rr?PduHeaders.VALUE_YES:PduHeaders.VALUE_NO);
     }
 
-    public static void sendReadRec(Context context, String to, String messageId, int status, long subId) {
+    public static void sendReadRec(Context context, String to, String messageId, int status, int subId) {
         EncodedStringValue[] sender = new EncodedStringValue[1];
         sender[0] = new EncodedStringValue(to);
 
@@ -180,7 +180,7 @@ public class MmsMessageSender implements MessageSender {
         }
     }
 
-    private static void updateSubIdForSend(Context context, Uri sendUri, long subId) {
+    private static void updateSubIdForSend(Context context, Uri sendUri, int subId) {
         long msgId = ContentUris.parseId(sendUri);
         //insert sim index in pdu table
         ContentValues values = new ContentValues(1);
diff --git a/src/com/android/mms/transaction/NotificationTransaction.java b/src/com/android/mms/transaction/NotificationTransaction.java
index 022a614b..bfa9db95 100644
--- a/src/com/android/mms/transaction/NotificationTransaction.java
+++ b/src/com/android/mms/transaction/NotificationTransaction.java
@@ -84,7 +84,7 @@ public class NotificationTransaction extends Transaction implements Runnable {
     public NotificationTransaction(
             Context context, int serviceId,
             TransactionSettings connectionSettings, String uriString,
-            long subId) {
+            int subId) {
         super(context, serviceId, connectionSettings, subId);
 
         mUri = Uri.parse(uriString);
@@ -110,7 +110,7 @@ public class NotificationTransaction extends Transaction implements Runnable {
     public NotificationTransaction(
             Context context, int serviceId,
             TransactionSettings connectionSettings, NotificationInd ind,
-            long subId) {
+            int subId) {
         super(context, serviceId, connectionSettings, subId);
 
         try {
@@ -137,7 +137,7 @@ public class NotificationTransaction extends Transaction implements Runnable {
         new Thread(this, "NotificationTransaction").start();
     }
 
-    public static boolean allowAutoDownload(Context context, long subId) {
+    public static boolean allowAutoDownload(Context context, int subId) {
         DownloadManager downloadManager = DownloadManager.getInstance();
         boolean autoDownload = downloadManager.isAuto();
         boolean dataSuspended = (MmsApp.getApplication().getTelephonyManager().getDataState() ==
diff --git a/src/com/android/mms/transaction/PushReceiver.java b/src/com/android/mms/transaction/PushReceiver.java
index 87f0bf0f..434bd35c 100644
--- a/src/com/android/mms/transaction/PushReceiver.java
+++ b/src/com/android/mms/transaction/PushReceiver.java
@@ -129,7 +129,7 @@ public class PushReceiver extends BroadcastReceiver {
                             // Save the pdu. If we can start downloading the real pdu immediately,
                             // don't allow persist() to create a thread for the notificationInd
                             // because it causes UI jank.
-                            long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+                            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                                     SubscriptionManager.INVALID_SUB_ID);
                             if (!SubscriptionManager.isValidSubId(subId)) {
                                 Log.e(TAG, "subId is invalid");
diff --git a/src/com/android/mms/transaction/ReadRecTransaction.java b/src/com/android/mms/transaction/ReadRecTransaction.java
index 7945ef61..d884e7e4 100755
--- a/src/com/android/mms/transaction/ReadRecTransaction.java
+++ b/src/com/android/mms/transaction/ReadRecTransaction.java
@@ -56,7 +56,7 @@ public class ReadRecTransaction extends Transaction implements Runnable{
             int transId,
             TransactionSettings connectionSettings,
             String uri,
-            long subId) {
+            int subId) {
         super(context, transId, connectionSettings, subId);
         mReadReportURI = Uri.parse(uri);
         mId = uri;
diff --git a/src/com/android/mms/transaction/RetrieveTransaction.java b/src/com/android/mms/transaction/RetrieveTransaction.java
index b32c51a9..888b7f19 100755
--- a/src/com/android/mms/transaction/RetrieveTransaction.java
+++ b/src/com/android/mms/transaction/RetrieveTransaction.java
@@ -78,7 +78,7 @@ public class RetrieveTransaction extends Transaction implements Runnable {
     static final int COLUMN_LOCKED                = 1;
 
     public RetrieveTransaction(Context context, int serviceId,
-            TransactionSettings connectionSettings, String uri, long subId)
+            TransactionSettings connectionSettings, String uri, int subId)
             throws MmsException {
         super(context, serviceId, connectionSettings, subId);
 
diff --git a/src/com/android/mms/transaction/SendTransaction.java b/src/com/android/mms/transaction/SendTransaction.java
index 57f193d1..da2fb1ab 100755
--- a/src/com/android/mms/transaction/SendTransaction.java
+++ b/src/com/android/mms/transaction/SendTransaction.java
@@ -61,7 +61,7 @@ public class SendTransaction extends Transaction implements Runnable {
     public final Uri mSendReqURI;
 
     public SendTransaction(Context context,
-            int transId, TransactionSettings connectionSettings, String uri, long subId) {
+            int transId, TransactionSettings connectionSettings, String uri, int subId) {
         super(context, transId, connectionSettings, subId);
         mSendReqURI = Uri.parse(uri);
         mId = uri;
diff --git a/src/com/android/mms/transaction/SimFullReceiver.java b/src/com/android/mms/transaction/SimFullReceiver.java
index 373f5f71..ac46e4da 100644
--- a/src/com/android/mms/transaction/SimFullReceiver.java
+++ b/src/com/android/mms/transaction/SimFullReceiver.java
@@ -48,7 +48,7 @@ public class SimFullReceiver extends BroadcastReceiver {
     // from SIM-FULL notification
     public static final String SIM_FULL_VIEWED_ACTION = "com.android.mms.ui.SIM_FULL_VIEWED";
     // Store SMS full SIM cards in a Set
-    private static TreeSet<Long> sFullSubIdSet = null;
+    private static TreeSet<Integer> sFullSubIdSet = null;
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -58,14 +58,14 @@ public class SimFullReceiver extends BroadcastReceiver {
             NotificationManager nm = (NotificationManager)
                 context.getSystemService(Context.NOTIFICATION_SERVICE);
             String action = intent.getAction();
-            long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                     SubscriptionManager.INVALID_SUB_ID);
             if (!SubscriptionManager.isValidSubId(subId)) {
                 Log.e(TAG, "subId is invalid");
                 return;
             }
             if (sFullSubIdSet == null) {
-                sFullSubIdSet = new TreeSet<Long>();
+                sFullSubIdSet = new TreeSet<Integer>();
             }
             // prepare full Subs list to refresh SIM full notification
             if (Telephony.Sms.Intents.SIM_FULL_ACTION.equals(action)) {
@@ -99,7 +99,7 @@ public class SimFullReceiver extends BroadcastReceiver {
                         MessagingPreferenceActivity.MANAGE_SIM_MESSAGE_MODE);
                 selectSubIntent.putExtra(MessagingPreferenceActivity.PREFERENCE_TITLE_ID,
                         R.string.pref_summary_manage_sim_messages);
-                long[] fullSubArray = getLongArrayFromSet(sFullSubIdSet);
+                int[] fullSubArray = getIntArrayFromSet(sFullSubIdSet);
                 selectSubIntent.putExtra(SubSelectActivity.EXTRA_APPOINTED_SUBS,
                         fullSubArray);
                 pendingIntent = PendingIntent.getActivity(context, 0, selectSubIntent,
@@ -121,10 +121,10 @@ public class SimFullReceiver extends BroadcastReceiver {
         }
     }
 
-    private long[] getLongArrayFromSet(Set<Long> set) {
+    private int[] getIntArrayFromSet(Set<Integer> set) {
         int size = set.size();
-        long[] result = new long[size];
-        Iterator<Long> interator = set.iterator();
+        int[] result = new int[size];
+        Iterator<Integer> interator = set.iterator();
         for (int i = 0; i < size; i++) {
             result[i] = interator.next();
         }
diff --git a/src/com/android/mms/transaction/SmsMessageSender.java b/src/com/android/mms/transaction/SmsMessageSender.java
index 4dd2c574..55387e03 100755
--- a/src/com/android/mms/transaction/SmsMessageSender.java
+++ b/src/com/android/mms/transaction/SmsMessageSender.java
@@ -40,7 +40,7 @@ public class SmsMessageSender implements MessageSender {
     protected final String mMessageText;
     protected final String mServiceCenter;
     protected final long mThreadId;
-    protected long mSubId;
+    protected int mSubId;
     protected long mTimestamp;
     private static final String TAG = LogTag.TAG;
 
@@ -55,7 +55,7 @@ public class SmsMessageSender implements MessageSender {
     private static final int COLUMN_REPLY_PATH_PRESENT = 0;
     private static final int COLUMN_SERVICE_CENTER     = 1;
 
-    public SmsMessageSender(Context context, String[] dests, String msgText, long threadId, long subId) {
+    public SmsMessageSender(Context context, String[] dests, String msgText, long threadId, int subId) {
         mContext = context;
         mMessageText = msgText;
         if (dests != null) {
diff --git a/src/com/android/mms/transaction/SmsReceiverService.java b/src/com/android/mms/transaction/SmsReceiverService.java
index d547f195..81519c71 100644
--- a/src/com/android/mms/transaction/SmsReceiverService.java
+++ b/src/com/android/mms/transaction/SmsReceiverService.java
@@ -113,7 +113,7 @@ public class SmsReceiverService extends Service {
 
     private int mResultCode;
 
-    private static HashSet<Long> sNoServiceSimSet = new HashSet<Long>();
+    private static HashSet<Integer> sNoServiceSimSet = new HashSet<Integer>();
 
     @Override
     public void onCreate() {
@@ -233,7 +233,7 @@ public class SmsReceiverService extends Service {
     private void handleServiceStateChanged(Intent intent) {
         // If service just returned, start sending out the queued messages
         ServiceState serviceState = ServiceState.newFromBundle(intent.getExtras());
-        long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                 SubscriptionManager.INVALID_SUB_ID);
         if (!SubscriptionManager.isValidSubId(subId)) {
             Log.e(TAG, "subId in handleServiceStateChanged() is invalid!");
@@ -279,7 +279,7 @@ public class SmsReceiverService extends Service {
                     String address = c.getString(SEND_COLUMN_ADDRESS);
                     int threadId = c.getInt(SEND_COLUMN_THREAD_ID);
                     int status = c.getInt(SEND_COLUMN_STATUS);
-                    long subId = c.getLong(SEND_COLUMN_SUB_ID);
+                    int subId = c.getInt(SEND_COLUMN_SUB_ID);
 
                     int msgId = c.getInt(SEND_COLUMN_ID);
                     Uri msgUri = ContentUris.withAppendedId(Sms.CONTENT_URI, msgId);
@@ -335,7 +335,7 @@ public class SmsReceiverService extends Service {
                     " = " + translateResultCode(mResultCode) + " error: " + error);
         }
 
-        long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+        int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                 SubscriptionManager.INVALID_SUB_ID);
         if (!SubscriptionManager.isValidSubId(subId)) {
             Log.e(TAG, "subId in handleSmsSent() is invalid!");
@@ -538,7 +538,7 @@ public class SmsReceiverService extends Service {
         ContentResolver resolver = context.getContentResolver();
         String originatingAddress = sms.getOriginatingAddress();
         int protocolIdentifier = sms.getProtocolIdentifier();
-        long subId = sms.getSubId();
+        int subId = sms.getSubId();
         if (!SubscriptionManager.isValidSubId(subId)) {
             Log.e(TAG, "subId is invalid in replaceMessage()!");
             return null;
@@ -632,7 +632,7 @@ public class SmsReceiverService extends Service {
             values.put(Sms.ADDRESS, address);
         }
 
-        long subId = sms.getSubId();
+        int subId = sms.getSubId();
         if (!SubscriptionManager.isValidSubId(subId)) {
             Log.e(TAG, "subId in storeMessage() is invalid!");
             return null;
@@ -702,7 +702,7 @@ public class SmsReceiverService extends Service {
     private void displayClassZeroMessage(Context context, SmsMessage sms, String format) {
         // Using NEW_TASK here is necessary because we're calling
         // startActivity from outside an activity.
-        long subId = sms.getSubId();
+        int subId = sms.getSubId();
         if (!SubscriptionManager.isValidSubId(subId)) {
             Log.e(TAG, "subId is invalid in displayClassZeroMessage()");
             return;
@@ -717,7 +717,7 @@ public class SmsReceiverService extends Service {
         context.startActivity(smsDialogIntent);
     }
 
-    private void registerForServiceStateChanges(long subId) {
+    private void registerForServiceStateChanges(int subId) {
         if (sNoServiceSimSet.isEmpty()) {
             Context context = getApplicationContext();
             unRegisterForServiceStateChanges();
@@ -749,7 +749,7 @@ public class SmsReceiverService extends Service {
 
     private String getNoServiceSimString() {
         StringBuilder stringBuilder = new StringBuilder();
-        Iterator<Long> noServiceIterator = sNoServiceSimSet.iterator();
+        Iterator<Integer> noServiceIterator = sNoServiceSimSet.iterator();
         while (noServiceIterator.hasNext()) {
             if (stringBuilder.length() != 0) {
                 stringBuilder.append(",");
diff --git a/src/com/android/mms/transaction/SmsSingleRecipientSender.java b/src/com/android/mms/transaction/SmsSingleRecipientSender.java
index be356181..7d9330d6 100755
--- a/src/com/android/mms/transaction/SmsSingleRecipientSender.java
+++ b/src/com/android/mms/transaction/SmsSingleRecipientSender.java
@@ -28,7 +28,7 @@ public class SmsSingleRecipientSender extends SmsMessageSender {
     private static final String TAG = LogTag.TAG;
 
     public SmsSingleRecipientSender(Context context, String dest, String msgText, long threadId,
-            boolean requestDeliveryReport, Uri uri, long subId) {
+            boolean requestDeliveryReport, Uri uri, int subId) {
         super(context, null, msgText, threadId, subId);
         mRequestDeliveryReport = requestDeliveryReport;
         mDest = dest;
diff --git a/src/com/android/mms/transaction/Transaction.java b/src/com/android/mms/transaction/Transaction.java
index 64d53e9c..c001de61 100755
--- a/src/com/android/mms/transaction/Transaction.java
+++ b/src/com/android/mms/transaction/Transaction.java
@@ -40,7 +40,7 @@ public abstract class Transaction extends Observable {
     protected String mId;
     protected TransactionState mTransactionState;
     protected TransactionSettings mTransactionSettings;
-    protected long mSubId;
+    protected int mSubId;
 
     /**
      * Identifies push requests.
@@ -60,7 +60,7 @@ public abstract class Transaction extends Observable {
     public static final int READREC_TRANSACTION      = 3;
 
     public Transaction(Context context, int serviceId,
-            TransactionSettings settings, long subId) {
+            TransactionSettings settings, int subId) {
         mContext = context;
         mTransactionState = new TransactionState();
         mServiceId = serviceId;
@@ -102,7 +102,7 @@ public abstract class Transaction extends Observable {
         return mServiceId;
     }
 
-    public long getSubId() {
+    public int getSubId() {
         return mSubId;
     }
 
diff --git a/src/com/android/mms/transaction/TransactionService.java b/src/com/android/mms/transaction/TransactionService.java
index 50c755e6..3d26e7b4 100644
--- a/src/com/android/mms/transaction/TransactionService.java
+++ b/src/com/android/mms/transaction/TransactionService.java
@@ -150,7 +150,7 @@ public class TransactionService extends Service implements Observer {
     private ConnectivityBroadcastReceiver mReceiver;
 
     private PowerManager.WakeLock mWakeLock;
-    private long mMmsDatasubId = SubscriptionManager.INVALID_SUB_ID;
+    private int mMmsDatasubId = SubscriptionManager.INVALID_SUB_ID;
 
     public Handler mToastHandler = new Handler() {
         @Override
@@ -311,7 +311,7 @@ public class TransactionService extends Service implements Observer {
                                 if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                                     Log.v(TAG, "onNewIntent: launchTransaction uri=" + uri);
                                 }
-                                launchTransaction(serviceId, args, false, cursor.getLong(columnIndexOfSubIndex));
+                                launchTransaction(serviceId, args, false, cursor.getInt(columnIndexOfSubIndex));
                                 break;
                         }
                     }
@@ -333,7 +333,7 @@ public class TransactionService extends Service implements Observer {
             TransactionBundle args = new TransactionBundle(intent.getIntExtra(
                     TransactionBundle.TRANSACTION_TYPE, Transaction.READREC_TRANSACTION),
                     intent.getStringExtra(TransactionBundle.URI));
-            long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                     SubscriptionManager.INVALID_SUB_ID);
             if (!SubscriptionManager.isValidSubId(subId)) {
                 Log.e(TAG, "onNewIntent subId error, " + args.toString());
@@ -373,7 +373,7 @@ public class TransactionService extends Service implements Observer {
         }
     }
 
-    private void launchTransaction(int serviceId, TransactionBundle txnBundle, boolean noNetwork, long subId) {
+    private void launchTransaction(int serviceId, TransactionBundle txnBundle, boolean noNetwork, int subId) {
         if (noNetwork) {
             Log.w(TAG, "launchTransaction: no network error!");
             onNetworkUnavailable(serviceId, txnBundle.getTransactionType());
@@ -547,7 +547,7 @@ public class TransactionService extends Service implements Observer {
         }
     }
 
-    protected int beginMmsConnectivity(long subId) throws IOException {
+    protected int beginMmsConnectivity(int subId) throws IOException {
         if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
             Log.v(TAG, "beginMmsConnectivity, subId = " + subId);
         }
@@ -572,7 +572,7 @@ public class TransactionService extends Service implements Observer {
         throw new IOException("Cannot establish MMS connectivity");
     }
 
-    protected void endMmsConnectivity(long subId) {
+    protected void endMmsConnectivity(int subId) {
         try {
             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                 Log.v(TAG, "endMmsConnectivity");
@@ -671,12 +671,12 @@ public class TransactionService extends Service implements Observer {
                     }
 
                     // Restart timer
-                    renewMmsConnectivity((long) (msg.arg2));
+                    renewMmsConnectivity(msg.arg2);
                     return;
 
                 case EVENT_TRANSACTION_REQUEST:
                     int serviceId = msg.arg1;
-                    long subId = msg.arg2;
+                    int subId = msg.arg2;
                     try {
                         TransactionBundle args = (TransactionBundle) msg.obj;
                         TransactionSettings transactionSettings;
@@ -798,7 +798,7 @@ public class TransactionService extends Service implements Observer {
             }
         }
 
-        public void markAllPendingTransactionsAsFailed(long subId) {
+        public void markAllPendingTransactionsAsFailed(int subId) {
             synchronized (mProcessing) {
                 ArrayList<Transaction> pendingList = (ArrayList<Transaction>) mPending.clone();
                 for (Transaction transaction : pendingList) {
@@ -958,7 +958,7 @@ public class TransactionService extends Service implements Observer {
         }
     }
 
-    private void renewMmsConnectivity(long subId) {
+    private void renewMmsConnectivity(int subId) {
         // Set a timer to keep renewing our "lease" on the MMS connection
         mServiceHandler.sendMessageDelayed(
                 mServiceHandler.obtainMessage(EVENT_CONTINUE_MMS_CONNECTIVITY, 0,
@@ -970,7 +970,7 @@ public class TransactionService extends Service implements Observer {
         @Override
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+            int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                     SubscriptionManager.INVALID_SUB_ID);
             if (Log.isLoggable(LogTag.TRANSACTION, Log.VERBOSE)) {
                 Log.w(TAG, "ConnectivityBroadcastReceiver.onReceive() action: " + action);
diff --git a/src/com/android/mms/ui/ClassZeroActivity.java b/src/com/android/mms/ui/ClassZeroActivity.java
index 82a83471..0124ff19 100644
--- a/src/com/android/mms/ui/ClassZeroActivity.java
+++ b/src/com/android/mms/ui/ClassZeroActivity.java
@@ -93,7 +93,7 @@ public class ClassZeroActivity extends Activity {
     private boolean queueMsgFromIntent(Intent msgIntent) {
         byte[] pdu = msgIntent.getByteArrayExtra("pdu");
         String format = msgIntent.getStringExtra("format");
-        long subId = msgIntent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+        int subId = msgIntent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                 SubscriptionManager.INVALID_SUB_ID);
         SmsMessage rawMessage = SmsMessage.createFromPdu(pdu, format);
         rawMessage.setSubId(subId);
@@ -251,7 +251,7 @@ public class ClassZeroActivity extends Activity {
 
     private Uri replaceMessage(SmsMessage sms) {
         ContentValues values = extractContentValues(sms);
-        long subId = sms.getSubId();
+        int subId = sms.getSubId();
 
         values.put(Inbox.BODY, sms.getMessageBody());
 
@@ -285,7 +285,7 @@ public class ClassZeroActivity extends Activity {
 
     private Uri storeMessage(SmsMessage sms) {
         // Store the message in the content provider.
-        long subId = sms.getSubId();
+        int subId = sms.getSubId();
         ContentValues values = extractContentValues(sms);
         ContentResolver resolver = getContentResolver();
         if (false) {
diff --git a/src/com/android/mms/ui/ComposeMessageActivity.java b/src/com/android/mms/ui/ComposeMessageActivity.java
index 28e4c6cc..de24b45b 100644
--- a/src/com/android/mms/ui/ComposeMessageActivity.java
+++ b/src/com/android/mms/ui/ComposeMessageActivity.java
@@ -351,7 +351,7 @@ public class ComposeMessageActivity extends Activity
     private final static String RECIPIENTS = "recipients";
 
     private AlertDialog mSubSelectDialog;
-    private long mSelectedSubId;
+    private int mSelectedSubId;
     private List<SubInfoRecord> mSubListInfo = new ArrayList<SubInfoRecord>();
     private List<SubInfoRecord> mEmptySubListInfo = new ArrayList<SubInfoRecord>();
     private SubChooseAdapter mSubAdapter;
diff --git a/src/com/android/mms/ui/ManageSimMessages.java b/src/com/android/mms/ui/ManageSimMessages.java
index aaac9d67..38098560 100644
--- a/src/com/android/mms/ui/ManageSimMessages.java
+++ b/src/com/android/mms/ui/ManageSimMessages.java
@@ -76,7 +76,7 @@ public class ManageSimMessages extends Activity
     private MessageListAdapter mListAdapter = null;
     private AsyncQueryHandler mQueryHandler = null;
 
-    private long mSubId = 0;
+    private int mSubId = 0;
 
     public static final int SIM_FULL_NOTIFICATION_ID = 234;
 
@@ -102,7 +102,7 @@ public class ManageSimMessages extends Activity
         ActionBar actionBar = getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
 
-        mSubId = getIntent().getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+        mSubId = getIntent().getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                 SubscriptionManager.getDefaultSmsSubId());
 
         init();
diff --git a/src/com/android/mms/ui/MessageItem.java b/src/com/android/mms/ui/MessageItem.java
index b6367926..275f975f 100755
--- a/src/com/android/mms/ui/MessageItem.java
+++ b/src/com/android/mms/ui/MessageItem.java
@@ -108,7 +108,7 @@ public class MessageItem {
     ColumnsMap mColumnsMap;
     private PduLoadedCallback mPduLoadedCallback;
     private ItemLoadedFuture mItemLoadedFuture;
-    long mSubId;
+    int mSubId;
 
     MessageItem(Context context, String type, final Cursor cursor,
             final ColumnsMap columnsMap, Pattern highlight) throws MmsException {
@@ -161,7 +161,7 @@ public class MessageItem {
 
             mLocked = cursor.getInt(columnsMap.mColumnSmsLocked) != 0;
             mErrorCode = cursor.getInt(columnsMap.mColumnSmsErrorCode);
-            mSubId = cursor.getLong(columnsMap.mColumnSmsSubId);
+            mSubId = cursor.getInt(columnsMap.mColumnSmsSubId);
 
         } else if ("mms".equals(type)) {
             mMessageUri = ContentUris.withAppendedId(Mms.CONTENT_URI, mMsgId);
@@ -187,7 +187,7 @@ public class MessageItem {
             mMmsStatus = cursor.getInt(columnsMap.mColumnMmsStatus);
             mAttachmentType = cursor.getInt(columnsMap.mColumnMmsTextOnly) != 0 ?
                     WorkingMessage.TEXT : ATTACHMENT_TYPE_NOT_LOADED;
-            mSubId = cursor.getLong(columnsMap.mColumnMmsSubId);
+            mSubId = cursor.getInt(columnsMap.mColumnMmsSubId);
 
             // Start an async load of the pdu. If the pdu is already loaded, the callback
             // will get called immediately
diff --git a/src/com/android/mms/ui/MessageListItem.java b/src/com/android/mms/ui/MessageListItem.java
index 2c56932e..b7a10b5e 100644
--- a/src/com/android/mms/ui/MessageListItem.java
+++ b/src/com/android/mms/ui/MessageListItem.java
@@ -264,7 +264,7 @@ public class MessageListItem extends LinearLayout implements
                     public void onClick(View v) {
                         mDownloadingLabel.setVisibility(View.VISIBLE);
                         mDownloadButton.setVisibility(View.GONE);
-                        long subId = mMessageItem.mSubId;
+                        int subId = mMessageItem.mSubId;
                         final Intent intent = new Intent(mContext, TransactionService.class);
                         intent.putExtra(TransactionBundle.URI, mMessageItem.mMessageUri.toString());
                         intent.putExtra(TransactionBundle.TRANSACTION_TYPE,
diff --git a/src/com/android/mms/ui/MessageUtils.java b/src/com/android/mms/ui/MessageUtils.java
index e2d73b45..cd126ce7 100644
--- a/src/com/android/mms/ui/MessageUtils.java
+++ b/src/com/android/mms/ui/MessageUtils.java
@@ -770,7 +770,7 @@ public class MessageUtils {
 
             while (c.moveToNext()) {
                 Uri uri = ContentUris.withAppendedId(Mms.CONTENT_URI, c.getLong(0));
-                long subId = c.getInt(2);
+                int subId = c.getInt(2);
                 map.put(c.getString(1), new ReadRecInfo(AddressUtils.getFrom(context, uri), subId));
             }
         } finally {
@@ -1042,8 +1042,8 @@ public class MessageUtils {
 
     private static class ReadRecInfo {
         private String mAddress;
-        private long mSubId;
-        public ReadRecInfo(String address, long subIndex) {
+        private int mSubId;
+        public ReadRecInfo(String address, int subIndex) {
             mAddress = address;
             mSubId = subIndex;
         }
@@ -1052,12 +1052,12 @@ public class MessageUtils {
             return mAddress;
         }
 
-        public long getSubIndex() {
+        public int getSubIndex() {
             return mSubId;
         }
     }
 
-    public static CharSequence getSubInfo(Context context, long subId) {
+    public static CharSequence getSubInfo(Context context, int subId) {
         Log.d(TAG, "getSubInfo subId = " + subId);
         if (!SubscriptionManager.isValidSubId(subId)) {
             return "";
@@ -1066,7 +1066,7 @@ public class MessageUtils {
         return getSubInfoSync(context, subId);
     }
 
-    public static CharSequence getSubInfoSync(Context context, long subId) {
+    public static CharSequence getSubInfoSync(Context context, int subId) {
         SubInfoRecord subInfo = SubscriptionManager.getSubInfoForSubscriber(subId);
         if (null == subInfo) {
             return "";
diff --git a/src/com/android/mms/ui/NoConfirmationSendService.java b/src/com/android/mms/ui/NoConfirmationSendService.java
index f9f64c8f..e9e65b34 100644
--- a/src/com/android/mms/ui/NoConfirmationSendService.java
+++ b/src/com/android/mms/ui/NoConfirmationSendService.java
@@ -61,7 +61,7 @@ public class NoConfirmationSendService extends IntentService {
         }
 
         String message = extras.getString(Intent.EXTRA_TEXT);
-        long subId = extras.getLong(PhoneConstants.SUBSCRIPTION_KEY,
+        int subId = extras.getInt(PhoneConstants.SUBSCRIPTION_KEY,
                 SubscriptionManager.INVALID_SUB_ID);
         if (!SubscriptionManager.isValidSubId(subId)) {
             Log.e(TAG, "subId is invalid");
diff --git a/src/com/android/mms/ui/SubSelectActivity.java b/src/com/android/mms/ui/SubSelectActivity.java
index f1afc84b..89573cfb 100644
--- a/src/com/android/mms/ui/SubSelectActivity.java
+++ b/src/com/android/mms/ui/SubSelectActivity.java
@@ -57,7 +57,7 @@ public class SubSelectActivity extends ListActivity {
     private int mPreferenceTitleId;
     private SubSelectAdapter mAdapter;
     private int mOldSubCount = 0;
-    private long[] mAppointedSubArray = null;
+    private int[] mAppointedSubArray = null;
 
     @Override
     protected void onCreate(Bundle icicle) {
@@ -91,7 +91,7 @@ public class SubSelectActivity extends ListActivity {
         super.onNewIntent(intent);
         getExtraValues(intent);
         setTitle(mPreferenceTitleId);
-        mAppointedSubArray = intent.getLongArrayExtra(EXTRA_APPOINTED_SUBS);
+        mAppointedSubArray = intent.getIntArrayExtra(EXTRA_APPOINTED_SUBS);
         refreshAdapter();
     }
 
@@ -99,7 +99,7 @@ public class SubSelectActivity extends ListActivity {
         mPreferenceKey = intent.getStringExtra(MessagingPreferenceActivity.PREFERENCE_KEY);
         mPreferenceTitleId = intent
                 .getIntExtra(MessagingPreferenceActivity.PREFERENCE_TITLE_ID, -1);
-        mAppointedSubArray = intent.getLongArrayExtra(EXTRA_APPOINTED_SUBS);
+        mAppointedSubArray = intent.getIntArrayExtra(EXTRA_APPOINTED_SUBS);
     }
 
     private void initialSubInfoList() {
@@ -194,8 +194,8 @@ public class SubSelectActivity extends ListActivity {
         }
     };
 
-    private boolean isSubIdInNeededShowArray(long subId) {
-        for (long id : mAppointedSubArray) {
+    private boolean isSubIdInNeededShowArray(int subId) {
+        for (int id : mAppointedSubArray) {
             if (subId == id) {
                 return true;
             }