Merge "[Telephony settings] Settings crashes when rotate screen in Preferred network type" (18e1a7c0) · Commits · e / os / android_packages_apps_Settings

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

+7 −5

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
		mCurSubscriptionId = updateSubscriptionIndex;
		mFragmentForceReload = (mCurSubscriptionId == oldSubId);
		final SubscriptionInfo info = getSubscription();
		updateSubscriptions(info);
		updateSubscriptions(info, null);

		// If the subscription has changed or the new intent doesnt contain the opt in action,
		// remove the old discovery dialog. If the activity is being recreated, we will see
		@@ -132,7 +132,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
		// perform registration after mCurSubscriptionId been configured.
		registerActiveSubscriptionsListener();

		updateSubscriptions(subscription);
		updateSubscriptions(subscription, savedInstanceState);
		}

		@VisibleForTesting
		@@ -154,7 +154,7 @@ public class MobileNetworkActivity extends SettingsBaseActivity
		public void onChanged() {
		SubscriptionInfo info = getSubscription();
		int oldSubIndex = mCurSubscriptionId;
		updateSubscriptions(info);
		updateSubscriptions(info, null);

		// Remove the dialog if the subscription associated with this activity changes.
		if (info == null) {
		@@ -209,14 +209,16 @@ public class MobileNetworkActivity extends SettingsBaseActivity
		}

		@VisibleForTesting
		void updateSubscriptions(SubscriptionInfo subscription) {
		void updateSubscriptions(SubscriptionInfo subscription, Bundle savedInstanceState) {
		if (subscription == null) {
		return;
		}
		final int subscriptionIndex = subscription.getSubscriptionId();

		updateTitleAndNavigation(subscription);
		if (savedInstanceState == null) {
		switchFragment(subscription);
		}

		mCurSubscriptionId = subscriptionIndex;
		mFragmentForceReload = false;