Merge "Fixed a Settings crash when entering SIM status" into lmp-mr1-dev (4d7a6248) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/deviceinfo/SimStatus.java

+27 −25

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ public class SimStatus extends PreferenceActivity {
		}
		}

		mSir = mSelectableSubInfos.get(0);
		mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
		if (mSelectableSubInfos.size() > 1) {
		setContentView(R.layout.sim_information);

		@@ -363,6 +363,7 @@ public class SimStatus extends PreferenceActivity {
		}

		private void updatePhoneInfos() {
		if (mSir != null) {
		final Phone phone = PhoneFactory.getPhone(SubscriptionManager.getPhoneId(
		mSir.getSubscriptionId()));
		if (UserHandle.myUserId() == UserHandle.USER_OWNER
		@@ -392,6 +393,7 @@ public class SimStatus extends PreferenceActivity {
		};
		}
		}
		}
		private OnTabChangeListener mTabListener = new OnTabChangeListener() {
		@Override
		public void onTabChanged(String tabId) {