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

Commit ac5a0828 authored by Paul Duffin's avatar Paul Duffin
Browse files

Improve Parcel's handling of non-primitive arrays 

Treat arrays other than actual Object arrays (i.e. those whose component type
is actually Object) and the primitive arrays already handled specially by
Parcel as Serializable's.

Issue: 64583
Change-Id: I3ff797f3262e77e4de27f35709bceee5410d1ed4
parent 3aeb629d

core/java/android/os/Parcel.java

+13 −8
Original line number Diff line number Diff line
@@ -1246,9 +1246,6 @@ public final class Parcel { 
        } else if (v instanceof Parcelable[]) {

            writeInt(VAL_PARCELABLEARRAY);

            writeParcelableArray((Parcelable[]) v, 0);

        } else if (v instanceof Object[]) {

            writeInt(VAL_OBJECTARRAY);

            writeArray((Object[]) v);

        } else if (v instanceof int[]) {

            writeInt(VAL_INTARRAY);

            writeIntArray((int[]) v);
@@ -1258,6 +1255,13 @@ public final class Parcel { 
        } else if (v instanceof Byte) {

            writeInt(VAL_BYTE);

            writeInt((Byte) v);

        } else {

            Class<?> clazz = v.getClass();

            if (clazz.isArray() && clazz.getComponentType() == Object.class) {

                // Only pure Object[] are written here, Other arrays of non-primitive types are

                // handled by serialization as this does not record the component type.

                writeInt(VAL_OBJECTARRAY);

                writeArray((Object[]) v);

            } else if (v instanceof Serializable) {

                // Must be last

                writeInt(VAL_SERIALIZABLE);
@@ -1266,6 +1270,7 @@ public final class Parcel { 
                throw new RuntimeException("Parcel: unable to marshal value " + v);

            }

        }

    }



    /**

     * Flatten the name of the class of the Parcelable and its contents