commit 4fda414ed6af00ebef5f0a033b906ebed06b6966
author Michael Wachenschwanz <mwachens@google.com> Wed Sep 05 19:01:27 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 05 19:01:27 2018 -0700
tree 7081dc023ab204ff088cd300c2b71eda18375a64
parent 07db04d9981e205d64ba90110ec0f4edfc5fd7d6
parent 1f5050c054c79cc7aeace5930f74933830988bbe

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

Change-Id: Ibae3dc08eabf5b12a8f1a03ea33bd54a28e0442e

core/java/android/os/Parcel.java

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