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

Commit 425b8699 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't require T to extend Parcelable or Serializable in Parcel" am: 6a2f196d 

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

Change-Id: Ie78e98103a3313414fbef82a808e2a0b3fdeba91
parents 215b89a5 6a2f196d

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -31590,7 +31590,7 @@ package android.os { 
    method @Deprecated public void readMap(@NonNull java.util.Map, @Nullable ClassLoader);

    method public <K, V> void readMap(@NonNull java.util.Map<? super K,? super V>, @Nullable ClassLoader, @NonNull Class<K>, @NonNull Class<V>);

    method @Deprecated @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader);

    method @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader, @NonNull Class<T>);

    method @Nullable public <T> T readParcelable(@Nullable ClassLoader, @NonNull Class<T>);

    method @Deprecated @Nullable public android.os.Parcelable[] readParcelableArray(@Nullable ClassLoader);

    method @Nullable public <T> T[] readParcelableArray(@Nullable ClassLoader, @NonNull Class<T>);

    method @Deprecated @Nullable public android.os.Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader);
@@ -31600,7 +31600,7 @@ package android.os { 
    method @Nullable public android.os.PersistableBundle readPersistableBundle();

    method @Nullable public android.os.PersistableBundle readPersistableBundle(@Nullable ClassLoader);

    method @Deprecated @Nullable public java.io.Serializable readSerializable();

    method @Nullable public <T extends java.io.Serializable> T readSerializable(@Nullable ClassLoader, @NonNull Class<T>);

    method @Nullable public <T> T readSerializable(@Nullable ClassLoader, @NonNull Class<T>);

    method @NonNull public android.util.Size readSize();

    method @NonNull public android.util.SizeF readSizeF();

    method @Deprecated @Nullable public <T> android.util.SparseArray<T> readSparseArray(@Nullable ClassLoader);

core/java/android/os/Parcel.java

+2 −13
Original line number Diff line number Diff line
@@ -4210,8 +4210,7 @@ public final class Parcel { 
     * trying to instantiate an element.

     */

    @Nullable

    public <T extends Parcelable> T readParcelable(@Nullable ClassLoader loader,

            @NonNull Class<T> clazz) {

    public <T> T readParcelable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) {

        Objects.requireNonNull(clazz);

        return readParcelableInternal(loader, clazz);

    }
@@ -4222,10 +4221,6 @@ public final class Parcel { 
    @SuppressWarnings("unchecked")

    @Nullable

    private <T> T readParcelableInternal(@Nullable ClassLoader loader, @Nullable Class<T> clazz) {

        if (clazz != null && !Parcelable.class.isAssignableFrom(clazz)) {

            throw new BadParcelableException("About to unparcel a parcelable object "

                    + " but class required " + clazz.getName() + " is not Parcelable");

        }

        Parcelable.Creator<?> creator = readParcelableCreatorInternal(loader, clazz);

        if (creator == null) {

            return null;
@@ -4461,8 +4456,7 @@ public final class Parcel { 
     * deserializing the object.

     */

    @Nullable

    public <T extends Serializable> T readSerializable(@Nullable ClassLoader loader,

            @NonNull Class<T> clazz) {

    public <T> T readSerializable(@Nullable ClassLoader loader, @NonNull Class<T> clazz) {

        Objects.requireNonNull(clazz);

        return readSerializableInternal(

                loader == null ? getClass().getClassLoader() : loader, clazz);
@@ -4474,11 +4468,6 @@ public final class Parcel { 
    @Nullable

    private <T> T readSerializableInternal(@Nullable final ClassLoader loader,

            @Nullable Class<T> clazz) {

        if (clazz != null && !Serializable.class.isAssignableFrom(clazz)) {

            throw new BadParcelableException("About to unparcel a serializable object "

                    + " but class required " + clazz.getName() + " is not Serializable");

        }



        String name = readString();

        if (name == null) {

            // For some reason we were unable to read the name of the Serializable (either there