Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b153181c authored by Stuart Scott's avatar Stuart Scott
Browse files

Use CharSequence for DisplayName 

Change-Id: I2601eb9dc1edf585ad3b48da9fb97c65cb1face5
parent 508a693c

src/com/android/settings/DataUsageSummary.java

+2 −2
Original line number Diff line number Diff line
@@ -710,7 +710,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
    /**

     * 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 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable 
                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

+5 −1
Original line number Diff line number Diff line
@@ -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());

            }

        }