commit 3ada2ecbe02c98da529aa106e538a4439219cb62
author Stuart Scott <stuartscott@google.com> Fri Oct 31 14:11:24 2014 -0700
committer Stuart Scott <stuartscott@google.com> Mon Nov 03 16:00:10 2014 -0800
tree 2bf899ca20eb55c9c8290884220093e3992fdedd
parent ba53a846b153b7318d7fc9e21763369b43358e30

Clean up public API of SubInfoRecord.

bug: 17575308
Change-Id: I38afd507b1c004fd566214c0b3812cab226936df

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 6ad1b9c..3aee293 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1134,7 +1134,7 @@
         final SubInfoRecord nextSir = SubscriptionManager.getSubInfoForSubscriber(
                 SubscriptionManager.getDefaultDataSubId());
 
-        if (currentSir.subId == nextSir.subId) {
+        if (currentSir.getSubscriptionId() == nextSir.getSubscriptionId()) {
             setMobileDataEnabled(true);
             updateBody();
             return;
@@ -1144,12 +1144,12 @@
 
         builder.setTitle(R.string.sim_change_data_title);
         builder.setMessage(getActivity().getResources().getString(R.string.sim_change_data_message,
-                    currentSir.displayName, nextSir.displayName));
+                    currentSir.getDisplayName(), nextSir.getDisplayName()));
 
         builder.setPositiveButton(R.string.okay, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int id) {
-                SubscriptionManager.setDefaultDataSubId(currentSir.subId);
+                SubscriptionManager.setDefaultDataSubId(currentSir.getSubscriptionId());
                 setMobileDataEnabled(true);
                 updateBody();
             }
@@ -2347,7 +2347,7 @@
         // require both supported network and ready SIM
         boolean isReady = true;
         for (SubInfoRecord subInfo : subInfoList) {
-            isReady = isReady & tele.getSimState(subInfo.slotId) == SIM_STATE_READY;
+            isReady = isReady & tele.getSimState(subInfo.getSimSlotIndex()) == SIM_STATE_READY;
         }
         return conn.isNetworkSupported(TYPE_MOBILE) && isReady;
     }
@@ -2588,9 +2588,9 @@
         private void addMobileTab(Context context, List<SubInfoRecord> subInfoList) {
             if (subInfoList != null) {
                 for (SubInfoRecord subInfo : mSubInfoList) {
-                    if (hasReadyMobileRadio(context, subInfo.subId)) {
-                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.subId),
-                                subInfo.displayName));
+                    if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
+                        mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
+                                subInfo.getDisplayName().toString()));
                     }
                 }
             }
@@ -2601,7 +2601,7 @@
                 final int currentTagIndex = mTabHost.getCurrentTab();
                 int i = 0;
                 for (SubInfoRecord subInfo : mSubInfoList) {
-                    if (hasReadyMobileRadio(context, subInfo.subId)) {
+                    if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
                         if (i++ == currentTagIndex) {
                             return subInfo;
                         }
@@ -2622,8 +2622,8 @@
                 String mobileTag;
                 map = new HashMap<Integer, String>();
                 for (SubInfoRecord subInfo : subInfoList) {
-                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.subId);
-                    map.put(subInfo.subId,mobileTag);
+                    mobileTag = TAB_MOBILE + String.valueOf(subInfo.getSubscriptionId());
+                    map.put(subInfo.getSubscriptionId(), mobileTag);
                 }
             }
             return map;