commit 7cf42221c67009e9a0fb5c6357022e53f601e8c2
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Aug 30 20:46:20 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Aug 30 20:46:20 2018 +0000
tree 7279a81a24879c304042c699c3ed29c4a7c4dca2
parent 5b78b0015e0ce0d16358409cae60eedf5ff7212f
parent 686897ddd9b819b4e9ca440bedb93f1091b65b9a

[automerger] Verify number of Map entries written to Parcel am: 057a01d1f3 am: d6947f1cbf am: 628cbe5c53 am: 433e4173ec am: 686897ddd9

Change-Id: I07c1d68a0c5d8da6ec81c717dff97d33dba86a16

core/java/android/os/Parcel.java

diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index a907e6e..a416fb7 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -745,11 +745,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!");
+        }
+
     }
 
     /**