Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 379daa98 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

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

Merge changes from topic "am-bdb0270e-8295-4ee6-be36-2709e172d48f" into oc-dev am: d32c2a41 am: 1f5050c0 am: 4fda414e
am: 78a2caeb

Change-Id: Ie28836c6080238499bc218b2fb11597235e5b7a1
parents ec2890f7 78a2caeb

core/java/android/os/Parcel.java

+9 −1
Original line number Diff line number Diff line
@@ -834,11 +834,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!");

        }



    }



    /**