diff options
| author | Hao Ke <haok@google.com> | 2022-02-25 18:49:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-25 18:49:37 +0000 |
| commit | 35ce6344cf5b498f439d3bb86183cfd47cdd36a8 (patch) | |
| tree | 648e02080f1367628978419806180a672147168d /core/java | |
| parent | d38ca191d57e72414eb238cb713293c1d7e72fee (diff) | |
| parent | 91117c2cfd37ec355523fb64047572d254c6c67e (diff) | |
Merge "Changing readParcelableList's API." am: 0b340743a6 am: 91117c2cfd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998972
Change-Id: If25de2f6b106e5a722965c7596d0f7f73734f55c
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/os/Parcel.java | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |