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

Commit e9889e0f 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 am: 6f2efc48

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

Change-Id: I708ea16d3907e8bde822c5cf370ae0a66355c1a5
parents 8cf7c034 6f2efc48
Loading
Loading
Loading
Loading
+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;