commit 78a2caeb94e7604c7207f7c843aa7a42590d5cd5
author Michael Wachenschwanz <mwachens@google.com> Wed Sep 05 20:23:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 05 20:23:16 2018 -0700
tree 748239356930ed97b22b806cf7851b704071796b
parent 132ec7bfa9352fc6605b2d80ad7b59671b83a414
parent 4fda414ed6af00ebef5f0a033b906ebed06b6966

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev am: d32c2a4189 am: 1f5050c054
am: 4fda414ed6

Change-Id: I7c7901f0147f7577240803cc2adc4e189f1994b4

core/java/android/os/Parcel.java

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