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

Commit 76d3072d authored by Samuel Tan's avatar Samuel Tan Committed by android-build-merger
Browse files

Merge "Fix PersistableBundle handling in Parcel.writeValue" am: d1295919 

am: d3decff0

* commit 'd3decff0':
  Fix PersistableBundle handling in Parcel.writeValue
parents 19091a7f d3decff0

core/java/android/os/Parcel.java

+6 −3
Original line number Diff line number Diff line
@@ -1370,7 +1370,13 @@ public final class Parcel { 
            // Must be before Parcelable

            writeInt(VAL_BUNDLE);

            writeBundle((Bundle) v);

        } else if (v instanceof PersistableBundle) {

            writeInt(VAL_PERSISTABLEBUNDLE);

            writePersistableBundle((PersistableBundle) v);

        } else if (v instanceof Parcelable) {

            // IMPOTANT: cases for classes that implement Parcelable must

            // come before the Parcelable case, so that their specific VAL_*

            // types will be written.

            writeInt(VAL_PARCELABLE);

            writeParcelable((Parcelable) v, 0);

        } else if (v instanceof Short) {
@@ -1426,9 +1432,6 @@ public final class Parcel { 
        } else if (v instanceof Byte) {

            writeInt(VAL_BYTE);

            writeInt((Byte) v);

        } else if (v instanceof PersistableBundle) {

            writeInt(VAL_PERSISTABLEBUNDLE);

            writePersistableBundle((PersistableBundle) v);

        } else if (v instanceof Size) {

            writeInt(VAL_SIZE);

            writeSize((Size) v);