Merge "[Settings] Code refactor on MobileNetworkActivity" into rvc-dev

src/com/android/settings/network/telephony/MobileNetworkActivity.java

@@ -103,7 +103,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        registerActiveSubscriptionsListener();
+        getProxySubscriptionManager().setLifecycle(getLifecycle());
 
         final Intent startIntent = getIntent();
         validate(startIntent);
@@ -116,13 +116,23 @@ public class MobileNetworkActivity extends SettingsBaseActivity
         final SubscriptionInfo subscription = getSubscription();
         updateTitleAndNavigation(subscription);
         maybeShowContactDiscoveryDialog(mCurSubscriptionId);
+
+        // Since onChanged() will take place immediately when addActiveSubscriptionsListener(),
+        // perform registration after mCurSubscriptionId been configured.
+        registerActiveSubscriptionsListener();
+    }
+
+    @VisibleForTesting
+    ProxySubscriptionManager getProxySubscriptionManager() {
+        if (mProxySubscriptionMgr == null) {
+            mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(this);
+        }
+        return mProxySubscriptionMgr;
     }
 
     @VisibleForTesting
     void registerActiveSubscriptionsListener() {
-        mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(this);
+        getProxySubscriptionManager().addActiveSubscriptionsListener(this);
-        mProxySubscriptionMgr.setLifecycle(getLifecycle());
-        mProxySubscriptionMgr.addActiveSubscriptionsListener(this);
     }
 
     /**
@@ -145,7 +155,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
 
     @Override
     protected void onStart() {
-        mProxySubscriptionMgr.setLifecycle(getLifecycle());
+        getProxySubscriptionManager().setLifecycle(getLifecycle());
         super.onStart();
         // updateSubscriptions doesn't need to be called, onChanged will always be called after we
         // register a listener.
@@ -201,19 +211,22 @@ public class MobileNetworkActivity extends SettingsBaseActivity
     @VisibleForTesting
     SubscriptionInfo getSubscription() {
         if (mCurSubscriptionId != SUB_ID_NULL) {
-            final SubscriptionInfo subInfo = SubscriptionUtil.getAvailableSubscription(
+            return getSubscriptionForSubId(mCurSubscriptionId);
-                    this, mProxySubscriptionMgr, mCurSubscriptionId);
-            if (subInfo != null) {
-                return subInfo;
         }
-        }
+        final List<SubscriptionInfo> subInfos = getProxySubscriptionManager()
-        final List<SubscriptionInfo> subInfos = mProxySubscriptionMgr.getActiveSubscriptionsInfo();
+                .getActiveSubscriptionsInfo();
         if (CollectionUtils.isEmpty(subInfos)) {
             return null;
         }
         return subInfos.get(0);
     }
 
+    @VisibleForTesting
+    SubscriptionInfo getSubscriptionForSubId(int subId) {
+        return SubscriptionUtil.getAvailableSubscription(this,
+                getProxySubscriptionManager(), subId);
+    }
+
     @VisibleForTesting
     void switchFragment(SubscriptionInfo subInfo) {
         final FragmentManager fragmentManager = getSupportFragmentManager();

tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java

@@ -112,8 +112,15 @@ public class MobileNetworkActivityTest {
         private SubscriptionInfo mSubscriptionInFragment;
 
         @Override
-        void registerActiveSubscriptionsListener() {
+        ProxySubscriptionManager getProxySubscriptionManager() {
+            if (mProxySubscriptionMgr == null) {
                 mProxySubscriptionMgr = mock(ProxySubscriptionManager.class);
+            }
+            return mProxySubscriptionMgr;
+        }
+
+        @Override
+        void registerActiveSubscriptionsListener() {
             onChanged();
         }