summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-05-15 18:18:43 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-15 18:18:43 -0700
commit0763e01c78a0febd02e344db5755479f57349a26 (patch)
treef796237d6188a624d73cdd817103d13cf68825d4 /core/java
parent80fea051ba7e8e3ad82eca3d907aaa4a528658d1 (diff)
parentcd9ea08d9cb68004b2d5f69302cddf53dc034e7b (diff)
downloadframeworks_base-0763e01c78a0febd02e344db5755479f57349a26.zip
frameworks_base-0763e01c78a0febd02e344db5755479f57349a26.tar.gz
frameworks_base-0763e01c78a0febd02e344db5755479f57349a26.tar.bz2
Merge "Fix amnesia problem in MultiSelectListPreference." into jb-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/preference/MultiSelectListPreference.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/preference/MultiSelectListPreference.java b/core/java/android/preference/MultiSelectListPreference.java
index 2e8d551..553ce80 100644
--- a/core/java/android/preference/MultiSelectListPreference.java
+++ b/core/java/android/preference/MultiSelectListPreference.java
@@ -125,8 +125,9 @@ public class MultiSelectListPreference extends DialogPreference {
* @param values The values to set for the key.
*/
public void setValues(Set<String> values) {
- mValues = values;
-
+ mValues.clear();
+ mValues.addAll(values);
+
persistStringSet(values);
}