am 39ac24df: Merge "Fix SimStatus crash in Settings." into mnc-dev

* commit '39ac24df7913546d8f2db3f17bc3d3dca5638e4a':
  Fix SimStatus crash in Settings.

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

@@ -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();
     }