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

Commit e58385ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] Verify number of Map entries written to Parcel am: 057a01d1
  Verify number of Map entries written to Parcel
parents 6b80718b d6947f1c

core/java/android/os/Parcel.java

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

        }



    }



    /**