summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-05-15 17:17:24 -0700
committerAmith Yamasani <yamasani@google.com>2012-05-15 17:17:24 -0700
commitcd9ea08d9cb68004b2d5f69302cddf53dc034e7b (patch)
tree04d3d6ed8c1806e94ea29fb7cb4487a51e095b45 /core/java/android
parent6387c8a9cb52e6b7bb1a0fb40ee3b66c00ad6697 (diff)
downloadframeworks_base-cd9ea08d9cb68004b2d5f69302cddf53dc034e7b.zip
frameworks_base-cd9ea08d9cb68004b2d5f69302cddf53dc034e7b.tar.gz
frameworks_base-cd9ea08d9cb68004b2d5f69302cddf53dc034e7b.tar.bz2
Fix amnesia problem in MultiSelectListPreference.
Bug: 6478079 Pointer assignment instead of copy was resulting in mValues being cleared on next launch, since mValues became the same pointer as mNewValues. Change-Id: I91014948e4f48056474b3ab31aab6d35e0ad69ca
Diffstat (limited to 'core/java/android')
-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);
}