Merge "Fix SimStatus crash in Settings." into mnc-dev

This commit is contained in:
Sanket Padawe
2015-05-06 22:04:11 +00:00
committed by Android (Google) Code Review

View File

@@ -143,7 +143,11 @@ public class SimStatus extends InstrumentedPreferenceActivity {
// Note - missing in zaku build, be careful later...
mSignalStrength = findPreference(KEY_SIGNAL_STRENGTH);
if (mSelectableSubInfos == null) {
mSir = null;
} else {
mSir = mSelectableSubInfos.size() > 0 ? mSelectableSubInfos.get(0) : null;
if (mSelectableSubInfos.size() > 1) {
setContentView(R.layout.sim_information);
@@ -160,7 +164,7 @@ public class SimStatus extends InstrumentedPreferenceActivity {
String.valueOf(mSelectableSubInfos.get(i).getDisplayName())));
}
}
}
updatePhoneInfos();
}