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

Change-Id: Idb2572b46c48fe2f3e4b99c5cb4372dcfe6b20ce

core/java/android/os/Parcel.java

@@ -692,11 +692,19 @@ public final class Parcel {
             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!");
+        }
+
     }
 
     /**