diff --git a/core/api/current.txt b/core/api/current.txt index 94ba409995e2d..3627f33cc4e67 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -31590,7 +31590,7 @@ package android.os { method @Deprecated public void readMap(@NonNull java.util.Map, @Nullable ClassLoader); method public void readMap(@NonNull java.util.Map, @Nullable ClassLoader, @NonNull Class, @NonNull Class); method @Deprecated @Nullable public T readParcelable(@Nullable ClassLoader); - method @Nullable public T readParcelable(@Nullable ClassLoader, @NonNull Class); + method @Nullable public T readParcelable(@Nullable ClassLoader, @NonNull Class); method @Deprecated @Nullable public android.os.Parcelable[] readParcelableArray(@Nullable ClassLoader); method @Nullable public T[] readParcelableArray(@Nullable ClassLoader, @NonNull Class); 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 readSerializable(@Nullable ClassLoader, @NonNull Class); + method @Nullable public T readSerializable(@Nullable ClassLoader, @NonNull Class); method @NonNull public android.util.Size readSize(); method @NonNull public android.util.SizeF readSizeF(); method @Deprecated @Nullable public android.util.SparseArray readSparseArray(@Nullable ClassLoader); diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index 4d5f97c599070..09eac79c991e5 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -4210,8 +4210,7 @@ public final class Parcel { * trying to instantiate an element. */ @Nullable - public T readParcelable(@Nullable ClassLoader loader, - @NonNull Class clazz) { + public T readParcelable(@Nullable ClassLoader loader, @NonNull Class clazz) { Objects.requireNonNull(clazz); return readParcelableInternal(loader, clazz); } @@ -4222,10 +4221,6 @@ public final class Parcel { @SuppressWarnings("unchecked") @Nullable private T readParcelableInternal(@Nullable ClassLoader loader, @Nullable Class 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 readSerializable(@Nullable ClassLoader loader, - @NonNull Class clazz) { + public T readSerializable(@Nullable ClassLoader loader, @NonNull Class clazz) { Objects.requireNonNull(clazz); return readSerializableInternal( loader == null ? getClass().getClassLoader() : loader, clazz); @@ -4474,11 +4468,6 @@ public final class Parcel { @Nullable private T readSerializableInternal(@Nullable final ClassLoader loader, @Nullable Class 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