commit d6947f1cbf084b53417a5496a441be208027e7b4
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Aug 30 20:45:51 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Aug 30 20:45:51 2018 +0000
tree 611b8cb01f5af50151be5657b7ce9d76f7e5b66e
parent 1425bb41aa61eaf10c93c5f153da131ac9f86a74
parent 057a01d1f38e9b46d3faa4059fdd7c8717681ea0

[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3

Change-Id: Idb2572b46c48fe2f3e4b99c5cb4372dcfe6b20ce

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index f6e6ad6..0591fa8 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -692,11 +692,19 @@
             return;
         }
         Set<Map.Entry<String,Object>> entries = val.entrySet();
-        writeInt(entries.size());
+        int size = entries.size();
+        writeInt(size);
+
         for (Map.Entry<String,Object> e : entries) {
             writeValue(e.getKey());
             writeValue(e.getValue());
+            size--;
         }
+
+        if (size != 0) {
+            throw new BadParcelableException("Map size does not match number of entries!");
+        }
+
     }
 
     /**