commit e9fe49dbda2ecdc880cb0929e86c15b0335127dc
author Wink Saville <wink@google.com> Thu Nov 20 20:29:15 2014 +0000
committer Wink Saville <wink@google.com> Thu Nov 20 20:29:15 2014 +0000
tree 8cb24d1e5e0bcff93a0062a66837f7983da04009
parent 88fd66a22ab781927556a34cdb7b14179efea917

Revert "Additional changes to SubscriptionManager API as per API council."

This reverts commit 88fd66a22ab781927556a34cdb7b14179efea917.

Change-Id: Ia6353137c665ca048bb1b02dee7bd581dec9973f

src/com/android/phone/PhoneInterfaceManager.java

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