Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Format ListPreference summary with empty string if entry is null" into lmp-mr1-dev

Browse Source
This commit is contained in:
Alan Viverette
2014-10-22 00:35:28 +00:00
committed by Android (Google) Code Review
parent 054e8be5e0 13e13ddd4e
commit bb852b0b6b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/preference/ListPreference.java
View File

@@ -162,10 +162,10 @@ public class ListPreference extends DialogPreference {
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
final CharSequence entry = getEntry(); final CharSequence entry = getEntry();
if (mSummary == null || entry == null) { if (mSummary == null) {
return super.getSummary(); return super.getSummary();
} else { } else {
return String.format(mSummary, entry); return String.format(mSummary, entry == null ? "" : entry);
} }
} }