diff options
| author | 2022-02-25 18:14:41 +0000 | |
|---|---|---|
| committer | 2022-02-25 18:14:41 +0000 | |
| commit | 0b340743a69cd2ed6634e6b097026b2e58f39526 (patch) | |
| tree | e60888765d8123ec7181187d621f82f955ac9d87 | |
| parent | 06ee57cda1e36d57e5fe59592708fab4201b4dd1 (diff) | |
| parent | 0641e854a6a6e95f3e6d28eb98f06af37f7e3a2a (diff) | |
Merge "Changing readParcelableList's API."
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Parcel.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index b5066d9a8cb0..c7392ea86d45 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -30301,7 +30301,7 @@ package android.os { method @Deprecated @Nullable public android.os.Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader); method @Nullable public <T> android.os.Parcelable.Creator<T> readParcelableCreator(@Nullable ClassLoader, @NonNull Class<T>); method @Deprecated @NonNull public <T extends android.os.Parcelable> java.util.List<T> readParcelableList(@NonNull java.util.List<T>, @Nullable ClassLoader); - method @NonNull public <T> java.util.List<T> readParcelableList(@NonNull java.util.List<T>, @Nullable ClassLoader, @NonNull Class<T>); + method @NonNull public <T> java.util.List<T> readParcelableList(@NonNull java.util.List<T>, @Nullable ClassLoader, @NonNull Class<? extends T>); method @Nullable public android.os.PersistableBundle readPersistableBundle(); method @Nullable public android.os.PersistableBundle readPersistableBundle(@Nullable ClassLoader); method @Deprecated @Nullable public java.io.Serializable readSerializable(); diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index f0fdc9b3b0f3..9b03172a45d6 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -3845,7 +3845,7 @@ public final class Parcel { */ @NonNull public <T> List<T> readParcelableList(@NonNull List<T> list, - @Nullable ClassLoader cl, @NonNull Class<T> clazz) { + @Nullable ClassLoader cl, @NonNull Class<? extends T> clazz) { Objects.requireNonNull(list); Objects.requireNonNull(clazz); return readParcelableListInternal(list, cl, clazz); @@ -3856,7 +3856,7 @@ public final class Parcel { */ @NonNull private <T> List<T> readParcelableListInternal(@NonNull List<T> list, - @Nullable ClassLoader cl, @Nullable Class<T> clazz) { + @Nullable ClassLoader cl, @Nullable Class<? extends T> clazz) { final int n = readInt(); if (n == -1) { list.clear(); |