commit ca7566125e00ed267aba831bd1d6d1ad78d90c17
author Wink Saville <wink@google.com> Sat Nov 08 10:47:12 2014 -0800
committer Wink Saville <wink@google.com> Tue Nov 11 07:06:03 2014 -0800
tree 7116a9d81e89b9a0e5f7a9f8d714d1705a8379b0
parent 64cb79bb6982ebe2907daed761d829dea4fef081

Update SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index e150d75..e687beb 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -60,7 +60,7 @@
 import android.provider.ContactsContract.Profile;
 import android.provider.ContactsContract.RawContacts;
 import android.service.persistentdata.PersistentDataBlockManager;
-import android.telephony.SubInfoRecord;
+import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
@@ -988,12 +988,13 @@
      * finds a record with subId.
      * Since the number of SIMs are few, an array is fine.
      */
-    public static SubInfoRecord findRecordBySubId(final int subId) {
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
+    public static SubscriptionInfo findRecordBySubId(final int subId) {
+        final List<SubscriptionInfo> subInfoList =
+                SubscriptionManager.getActiveSubscriptionInfoList();
         final int subInfoLength = subInfoList.size();
 
         for (int i = 0; i < subInfoLength; ++i) {
-            final SubInfoRecord sir = subInfoList.get(i);
+            final SubscriptionInfo sir = subInfoList.get(i);
             if (sir != null && sir.getSubscriptionId() == subId) {
                 return sir;
             }
@@ -1006,12 +1007,13 @@
      * finds a record with slotId.
      * Since the number of SIMs are few, an array is fine.
      */
-    public static SubInfoRecord findRecordBySlotId(final int slotId) {
-        final List<SubInfoRecord> subInfoList = SubscriptionManager.getActiveSubInfoList();
+    public static SubscriptionInfo findRecordBySlotId(final int slotId) {
+        final List<SubscriptionInfo> subInfoList =
+                SubscriptionManager.getActiveSubscriptionInfoList();
         final int subInfoLength = subInfoList.size();
 
         for (int i = 0; i < subInfoLength; ++i) {
-            final SubInfoRecord sir = subInfoList.get(i);
+            final SubscriptionInfo sir = subInfoList.get(i);
             if (sir.getSimSlotIndex() == slotId) {
                 //Right now we take the first subscription on a SIM.
                 return sir;