Fix SimStatus crash in Settings.

Bug: 20862873 Change-Id: I1ae60ceb64a8af8b3f875e50dd62dfe9796192ca
2015-05-05 19:00:39 -07:00
parent c531044671
commit 5a3b91cdbb
1 changed files with 17 additions and 13 deletions
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/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();
    }