Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62

1 files changed, 21 insertions, 17 deletions

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index dc9e8a2..ad54c6b 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -988,15 +988,17 @@ public final class Utils {
      * finds a record with subId.
      * Since the number of SIMs are few, an array is fine.
      */
-    public static SubscriptionInfo findRecordBySubId(final int subId) {
+    public static SubscriptionInfo findRecordBySubId(Context context, final int subId) {
         final List<SubscriptionInfo> subInfoList =
-                SubscriptionManager.getActiveSubscriptionInfoList();
-        final int subInfoLength = subInfoList.size();
-
-        for (int i = 0; i < subInfoLength; ++i) {
-            final SubscriptionInfo sir = subInfoList.get(i);
-            if (sir != null && sir.getSubscriptionId() == subId) {
-                return sir;
+                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
+        if (subInfoList != null) {
+            final int subInfoLength = subInfoList.size();
+
+            for (int i = 0; i < subInfoLength; ++i) {
+                final SubscriptionInfo sir = subInfoList.get(i);
+                if (sir != null && sir.getSubscriptionId() == subId) {
+                    return sir;
+                }
             }
         }
 
@@ -1007,16 +1009,18 @@ public final class Utils {
      * finds a record with slotId.
      * Since the number of SIMs are few, an array is fine.
      */
-    public static SubscriptionInfo findRecordBySlotId(final int slotId) {
+    public static SubscriptionInfo findRecordBySlotId(Context context, final int slotId) {
         final List<SubscriptionInfo> subInfoList =
-                SubscriptionManager.getActiveSubscriptionInfoList();
-        final int subInfoLength = subInfoList.size();
-
-        for (int i = 0; i < subInfoLength; ++i) {
-            final SubscriptionInfo sir = subInfoList.get(i);
-            if (sir.getSimSlotIndex() == slotId) {
-                //Right now we take the first subscription on a SIM.
-                return sir;
+                SubscriptionManager.from(context).getActiveSubscriptionInfoList();
+        if (subInfoList != null) {
+            final int subInfoLength = subInfoList.size();
+
+            for (int i = 0; i < subInfoLength; ++i) {
+                final SubscriptionInfo sir = subInfoList.get(i);
+                if (sir.getSimSlotIndex() == slotId) {
+                    //Right now we take the first subscription on a SIM.
+                    return sir;
+                }
             }
         }