commit 3ab207e3711ebd717f9cfe7412018c51ae1c8131
author Wink Saville <wink@google.com> Thu Nov 20 13:07:20 2014 -0800
committer Wink Saville <wink@google.com> Fri Nov 21 16:47:22 2014 -0800
tree c27a7a69ae76ce6f3e3c2798cfd85739643662f5
parent eace2add653b8c6df9b9afd40e1fb24ce5807321

Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1ca4a8c..dc6bc1b 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -133,13 +133,14 @@
     /** The singleton instance. */
     private static PhoneInterfaceManager sInstance;
 
-    PhoneGlobals mApp;
-    Phone mPhone;
-    CallManager mCM;
-    AppOpsManager mAppOps;
-    MainThreadHandler mMainThreadHandler;
+    private PhoneGlobals mApp;
+    private Phone mPhone;
+    private CallManager mCM;
+    private AppOpsManager mAppOps;
+    private MainThreadHandler mMainThreadHandler;
+    private SubscriptionManager mSubscriptionManager;
+    private SharedPreferences mTelephonySharedPreferences;
 
-    SharedPreferences mTelephonySharedPreferences;
     private static final String PREF_CARRIERS_ALPHATAG_PREFIX = "carrier_alphtag_";
     private static final String PREF_CARRIERS_NUMBER_PREFIX = "carrier_number_";
     private static final String PREF_ENABLE_VIDEO_CALLING = "enable_video_calling";
@@ -726,6 +727,8 @@
         mMainThreadHandler = new MainThreadHandler();
         mTelephonySharedPreferences =
                 PreferenceManager.getDefaultSharedPreferences(mPhone.getContext());
+        mSubscriptionManager = SubscriptionManager.from(app);
+
         publish();
     }
 
@@ -790,11 +793,13 @@
         }
 
         boolean isValid = false;
-        List<SubscriptionInfo> slist = SubscriptionManager.getActiveSubscriptionInfoList();
-        for (SubscriptionInfo subInfoRecord : slist) {
-            if (subInfoRecord.getSubscriptionId() == subId) {
-                isValid = true;
-                break;
+        List<SubscriptionInfo> slist = mSubscriptionManager.getActiveSubscriptionInfoList();
+        if (slist != null) {
+            for (SubscriptionInfo subInfoRecord : slist) {
+                if (subInfoRecord.getSubscriptionId() == subId) {
+                    isValid = true;
+                    break;
+                }
             }
         }
         if (isValid == false) {