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

Commit c4a12a7a authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

am bb852b0b: Merge "Format ListPreference summary with empty string if entry... 

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

* commit 'bb852b0b':
  Format ListPreference summary with empty string if entry is null
parents e055c95b bb852b0b

core/java/android/preference/ListPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -162,10 +162,10 @@ public class ListPreference extends DialogPreference { 
    @Override

    public CharSequence getSummary() {

        final CharSequence entry = getEntry();

        if (mSummary == null || entry == null) {

        if (mSummary == null) {

            return super.getSummary();

        } else {

            return String.format(mSummary, entry);

            return String.format(mSummary, entry == null ? "" : entry);

        }

    }