Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use writeStringList for selection parceling.

Browse Source 
Bug: 27208679
Change-Id: Id0506e49254e0b3fcddb7d3f92717da0a95f2f6d
This commit is contained in:
Steve McKay
2016-04-08 17:36:07 -07:00
parent da9f52a795
commit 4f89b6c6b8
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/DocumentsUI/src/com/android/documentsui/dirlist/MultiSelectManager.java
View File

@@ -672,9 +672,9 @@ public final class MultiSelectManager {
/**
* 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 final class MultiSelectManager {
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 @@ public final class MultiSelectManager {
@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