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

Commit 5002b8c9 authored by John Spurlock's avatar John Spurlock
Browse files

Use custom classloader if provided for Serializables. 

If an explicit classloader is provided during unparcel, use it
when deserializing java serializables.

Change-Id: I2b354f0b55359201528234b8095aa0bc102928ec
parent ddf89c0c

core/java/android/os/Parcel.java

+21 −3
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import java.io.FileNotFoundException; 
import java.io.IOException;

import java.io.ObjectInputStream;

import java.io.ObjectOutputStream;

import java.io.ObjectStreamClass;

import java.io.Serializable;

import java.lang.reflect.Field;

import java.util.ArrayList;
@@ -2061,7 +2062,7 @@ public final class Parcel { 
            return readByte();



        case VAL_SERIALIZABLE:

            return readSerializable();

            return readSerializable(loader);



        case VAL_PARCELABLEARRAY:

            return readParcelableArray(loader);
@@ -2198,6 +2199,10 @@ public final class Parcel { 
     * wasn't found in the parcel.

     */

    public final Serializable readSerializable() {

        return readSerializable(null);

    }



    private final Serializable readSerializable(final ClassLoader loader) {

        String name = readString();

        if (name == null) {

            // For some reason we were unable to read the name of the Serializable (either there
@@ -2209,7 +2214,20 @@ public final class Parcel { 
        byte[] serializedData = createByteArray();

        ByteArrayInputStream bais = new ByteArrayInputStream(serializedData);

        try {

            ObjectInputStream ois = new ObjectInputStream(bais);

            ObjectInputStream ois = new ObjectInputStream(bais) {

                @Override

                protected Class<?> resolveClass(ObjectStreamClass osClass)

                        throws IOException, ClassNotFoundException {

                    // try the custom classloader if provided

                    if (loader != null) {

                        Class<?> c = Class.forName(osClass.getName(), false, loader);

                        if (c != null) {

                            return c;

                        }

                    }

                    return super.resolveClass(osClass);

                }

            };

            return (Serializable) ois.readObject();

        } catch (IOException ioe) {

            throw new RuntimeException("Parcelable encountered " +