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

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev

Browse Source 
am: d32c2a4189

Change-Id: Ie2ad590368e9c10f6222d9ae65470ebb12dabac2
This commit is contained in:
Michael Wachenschwanz
2018-09-05 18:46:57 -07:00
committed by android-build-merger
parent 79ee5768da d32c2a4189
commit 1f5050c054
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/Parcel.java
View File

@@ -746,11 +746,19 @@ public final class Parcel {
return; return;
} }
Set<Map.Entry<String,Object>> entries = val.entrySet(); Set<Map.Entry<String,Object>> entries = val.entrySet();
writeInt(entries.size()); int size = entries.size();
writeInt(size);
for (Map.Entry<String,Object> e : entries) { for (Map.Entry<String,Object> e : entries) {
writeValue(e.getKey()); writeValue(e.getKey());
writeValue(e.getValue()); writeValue(e.getValue());
size--;
} }
if (size != 0) {
throw new BadParcelableException("Map size does not match number of entries!");
}
} }
/** /**