Use writeStringList for selection parceling.
Bug: 27208679
Change-Id: Id0506e49254e0b3fcddb7d3f92717da0a95f2f6d
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java
index b80486d..1285b34 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java
@@ -672,9 +672,9 @@
/**
* Used by CREATOR.
*/
- private Selection(String directoryKey, List<String> selection) {
+ private Selection(String directoryKey, Set<String> selection) {
mDirectoryKey = directoryKey;
- mSelection = new HashSet<String>(selection);
+ mSelection = selection;
mProvisionalSelection = new HashSet<String>();
}
@@ -887,7 +887,7 @@
public void writeToParcel(Parcel dest, int flags) {
dest.writeString(mDirectoryKey);
- dest.writeList(new ArrayList<>(mSelection));
+ dest.writeStringList(new ArrayList<>(mSelection));
// We don't include provisional selection since it is
// typically coupled to some other runtime state (like a band).
}
@@ -901,9 +901,12 @@
@Override
public Selection createFromParcel(Parcel in, ClassLoader loader) {
- return new Selection(
- in.readString(),
- in.readArrayList(loader));
+ String directoryKey = in.readString();
+
+ ArrayList<String> selected = new ArrayList<>();
+ in.readStringList(selected);
+
+ return new Selection(directoryKey, new HashSet<String>(selected));
}
@Override