Use CharSequence for DisplayName

Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
2014-11-04 14:52:23 -08:00
parent 508a693c9a
commit b153181c9c
2 changed files with 7 additions and 3 deletions
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -370,7 +370,11 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
        } else {
            for (int i = 0; i < selectableSubInfoLength; ++i) {
                final SubInfoRecord sir = mSelectableSubInfos.get(i);
-                list.add(sir.getDisplayName().toString());
+                CharSequence displayName = sir.getDisplayName();
+                if (displayName == null) {
+                    displayName = "";
+                }
+                list.add(displayName.toString());
            }
        }