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

Commit 6f2efc48 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "ParcelableHolder: assert stability on read" am: 180aa227 am: a9febdf1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020960

Change-Id: Ice98a4c2cd8e96dee7f7be8052e946ae41ba7ef7
parents d80c079b a9febdf1

core/java/android/os/ParcelableHolder.java

+5 −1
Original line number Diff line number Diff line
@@ -179,7 +179,11 @@ public final class ParcelableHolder implements Parcelable { 
     * Read ParcelableHolder from a parcel.

     */

    public void readFromParcel(@NonNull Parcel parcel) {

        this.mStability = parcel.readInt();

        int wireStability = parcel.readInt();

        if (this.mStability != wireStability) {

            throw new IllegalArgumentException("Expected stability " + this.mStability

                                               + " but got " + wireStability);

        }



        mParcelable = null;