diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index e9aaf0f..ba0d24d 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -268,7 +268,7 @@
     private MenuItem mMenuCellularNetworks;
 
     private List<SubInfoRecord> mSubInfoList;
-    private Map<Long,String> mMobileTagMap;
+    private Map<Integer,String> mMobileTagMap;
 
     /** Flag used to ignore listeners during binding. */
     private boolean mBinding;
@@ -932,7 +932,7 @@
      */
     private Boolean mMobileDataEnabled;
 
-    private boolean isMobileDataEnabled(long subId) {
+    private boolean isMobileDataEnabled(int subId) {
         boolean isEnable = false;
         if (mMobileDataEnabled != null) {
             // TODO: deprecate and remove this once enabled flag is on policy
@@ -1352,7 +1352,7 @@
         return SystemProperties.get(TEST_SUBSCRIBER_PROP, actualSubscriberId);
     }
 
-    private static String getActiveSubscriberId(Context context, long subId) {
+    private static String getActiveSubscriberId(Context context, int subId) {
         final TelephonyManager tele = TelephonyManager.from(context);
         return tele.getSubscriberId(subId);
     }
@@ -2209,7 +2209,7 @@
     private static String computeTabFromIntent(Intent intent) {
         final NetworkTemplate template = intent.getParcelableExtra(EXTRA_NETWORK_TEMPLATE);
         if (template == null) {
-            final long subId = intent.getLongExtra(PhoneConstants.SUBSCRIPTION_KEY,
+            final int subId = intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY,
                     SubscriptionManager.INVALID_SUB_ID);
             if (SubscriptionManager.isValidSubId(subId)) {
                 return TAB_MOBILE + String.valueOf(subId);
@@ -2319,7 +2319,7 @@
     /*
      * TODO: consider adding to TelephonyManager or SubscritpionManager.
      */
-    public static boolean hasReadyMobileRadio(Context context, long subId) {
+    public static boolean hasReadyMobileRadio(Context context, int subId) {
         if (TEST_RADIOS) {
             return SystemProperties.get(TEST_RADIOS_PROP).contains("mobile");
         }
@@ -2565,11 +2565,11 @@
          * @param subInfoList The subscription Info List
          * @return The map or null if no activated subscription
          */
-        private Map<Long, String> initMobileTabTag(List<SubInfoRecord> subInfoList) {
-            Map<Long,String> map = null;
+        private Map<Integer, String> initMobileTabTag(List<SubInfoRecord> subInfoList) {
+            Map<Integer, String> map = null;
             if (subInfoList != null) {
                 String mobileTag;
-                map = new HashMap<Long, String>();
+                map = new HashMap<Integer, String>();
                 for (SubInfoRecord subInfo : subInfoList) {
                     mobileTag = TAB_MOBILE + String.valueOf(subInfo.subId);
                     map.put(subInfo.subId,mobileTag);
@@ -2582,9 +2582,9 @@
             return currentTab != null ? currentTab.contains(TAB_MOBILE) : false;
         }
 
-        private long getSubId(String currentTab) {
-            Set<Long> set = mMobileTagMap.keySet();
-            for (Long subId : set) {
+        private int getSubId(String currentTab) {
+            Set<Integer> set = mMobileTagMap.keySet();
+            for (Integer subId : set) {
                 if (mMobileTagMap.get(subId).equals(currentTab)) {
                     return subId;
                 }
@@ -2594,8 +2594,8 @@
         }
 
         //SUB SELECT
-        private boolean isMobileDataAvailable(long subId) {
-            long[] subIds = SubscriptionManager.getSubId(PhoneConstants.SUB1);
+        private boolean isMobileDataAvailable(int subId) {
+            int[] subIds = SubscriptionManager.getSubId(PhoneConstants.SUB1);
             return subIds[0] == subId;
         }
 }
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index e1272ff..8a96ac7 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -241,7 +241,7 @@
      * finds a record with subId.
      * Since the number of SIMs are few, an array is fine.
      */
-    private SubInfoRecord findRecordBySubId(final long subId) {
+    private SubInfoRecord findRecordBySubId(final int subId) {
         final int availableSubInfoLength = mAvailableSubInfos.size();
 
         for (int i = 0; i < availableSubInfoLength; ++i) {