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

Commit d1295919 authored by Samuel Tan's avatar Samuel Tan Committed by Gerrit Code Review
Browse files

Merge "Fix PersistableBundle handling in Parcel.writeValue"

parents 477fa220 ceafe5ed

core/java/android/os/Parcel.java

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

            // Must be before Parcelable

            writeInt(VAL_BUNDLE);

            writeInt(VAL_BUNDLE);

            writeBundle((Bundle) v);

            writeBundle((Bundle) v);

        } else if (v instanceof PersistableBundle) {

            writeInt(VAL_PERSISTABLEBUNDLE);

            writePersistableBundle((PersistableBundle) v);

        } else if (v instanceof Parcelable) {

        } 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);

            writeInt(VAL_PARCELABLE);

            writeParcelable((Parcelable) v, 0);

            writeParcelable((Parcelable) v, 0);

        } else if (v instanceof Short) {

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

        } else if (v instanceof Byte) {

            writeInt(VAL_BYTE);

            writeInt(VAL_BYTE);

            writeInt((Byte) v);

            writeInt((Byte) v);

        } else if (v instanceof PersistableBundle) {

            writeInt(VAL_PERSISTABLEBUNDLE);

            writePersistableBundle((PersistableBundle) v);

        } else if (v instanceof Size) {

        } else if (v instanceof Size) {

            writeInt(VAL_SIZE);

            writeInt(VAL_SIZE);

            writeSize((Size) v);

            writeSize((Size) v);