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

am: d32c2a4189 Change-Id: Ie2ad590368e9c10f6222d9ae65470ebb12dabac2
2018-09-05 18:46:57 -07:00
parent 79ee5768da d32c2a4189
commit 1f5050c054
1 changed files with 9 additions and 1 deletions
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -746,11 +746,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!");
+        }
+
    }

    /**