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

Commit ece60fb2 authored by Justin Koh's avatar Justin Koh Committed by Adam Powell
Browse files

Framework: fixed bug in multiselectlistpreference. 

Fixed bug in multiselectlistpreference where the entries were being used instead of the entry values.  This change make the behavior match the documentation.

TESTED = runs on M4 with test app.

Change-Id: Ib337f78399e032ef50aabce0fb8aa38251d73c18
parent d0f650c6

core/java/android/preference/MultiSelectListPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -169,9 +169,9 @@ public class MultiSelectListPreference extends DialogPreference { 
                new DialogInterface.OnMultiChoiceClickListener() {

                    public void onClick(DialogInterface dialog, int which, boolean isChecked) {

                        if (isChecked) {

                            mPreferenceChanged |= mNewValues.add(mEntries[which].toString());

                            mPreferenceChanged |= mNewValues.add(mEntryValues[which].toString());

                        } else {

                            mPreferenceChanged |= mNewValues.remove(mEntries[which].toString());

                            mPreferenceChanged |= mNewValues.remove(mEntryValues[which].toString());

                        }

                    }

                });
@@ -180,7 +180,7 @@ public class MultiSelectListPreference extends DialogPreference { 
    }

    

    private boolean[] getSelectedItems() {

        final CharSequence[] entries = mEntries;

        final CharSequence[] entries = mEntryValues;

        final int entryCount = entries.length;

        final Set<String> values = mValues;

        boolean[] result = new boolean[entryCount];