commit b153181c9c597085769d69796ecf07ec6d4433d2
author Stuart Scott <stuartscott@google.com> Tue Nov 04 14:52:23 2014 -0800
committer Stuart Scott <stuartscott@google.com> Tue Nov 04 14:52:23 2014 -0800
tree e0700575344267e924e8045a4541f47a1873ee81
parent 508a693c9a240a5f297704c8cc837a3cb5702d6c

Use CharSequence for DisplayName

Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 3aee293..08de3b7 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -710,7 +710,7 @@
     /**
      * Build {@link TabSpec} with thin indicator, and empty content.
      */
-    private TabSpec buildTabSpec(String tag, String title) {
+    private TabSpec buildTabSpec(String tag, CharSequence title) {
         return mTabHost.newTabSpec(tag).setIndicator(title).setContent(
                 mEmptyTabContent);
     }
@@ -2590,7 +2590,7 @@
                 for (SubInfoRecord subInfo : mSubInfoList) {
                     if (hasReadyMobileRadio(context, subInfo.getSubscriptionId())) {
                         mTabHost.addTab(buildTabSpec(mMobileTagMap.get(subInfo.getSubscriptionId()),
-                                subInfo.getDisplayName().toString()));
+                                subInfo.getDisplayName()));
                     }
                 }
             }

src/com/android/settings/sim/SimSettings.java

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 706e0f3..2d5fdc5 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -370,7 +370,11 @@
         } 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());
             }
         }