diff --git a/core/api/current.txt b/core/api/current.txt index ce5085bab3633..23035584f6968 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -30385,7 +30385,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); @@ -30395,7 +30395,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 ffaff9533c8c9..09eac79c991e5 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -3704,10 +3704,10 @@ public final class Parcel { final int m = list.size(); int i = 0; for (; i < m && i < n; i++) { - list.set(i, readParcelableInternal(cl, clazz)); + list.set(i, (T) readParcelableInternal(cl, clazz)); } for (; i < n; i++) { - list.add(readParcelableInternal(cl, clazz)); + list.add((T) readParcelableInternal(cl, clazz)); } for (; i < m; i++) { list.remove(n); @@ -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); } @@ -4221,8 +4220,7 @@ public final class Parcel { */ @SuppressWarnings("unchecked") @Nullable - private T readParcelableInternal(@Nullable ClassLoader loader, - @Nullable Class clazz) { + private T readParcelableInternal(@Nullable ClassLoader loader, @Nullable Class clazz) { Parcelable.Creator creator = readParcelableCreatorInternal(loader, clazz); if (creator == null) { return null; @@ -4458,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); @@ -4469,8 +4466,8 @@ public final class Parcel { * @param clazz The type of the serializable expected or {@code null} for performing no checks */ @Nullable - private T readSerializableInternal(@Nullable final ClassLoader loader, - @Nullable Class clazz) { + private T readSerializableInternal(@Nullable final ClassLoader loader, + @Nullable Class clazz) { String name = readString(); if (name == null) { // For some reason we were unable to read the name of the Serializable (either there