Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Changing readParcelableList's API."

Browse Source
This commit is contained in:
Hao Ke
2022-02-25 18:14:41 +00:00
committed by Gerrit Code Review
parent 06ee57cda1 0641e854a6
commit 0b340743a6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -30301,7 +30301,7 @@ package android.os {
method @Deprecated @Nullable public android.os.Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader); 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 @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 @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();
method @Nullable public android.os.PersistableBundle readPersistableBundle(@Nullable ClassLoader); method @Nullable public android.os.PersistableBundle readPersistableBundle(@Nullable ClassLoader);
method @Deprecated @Nullable public java.io.Serializable readSerializable(); method @Deprecated @Nullable public java.io.Serializable readSerializable();

4
core/java/android/os/Parcel.java
View File

@@ -3845,7 +3845,7 @@ public final class Parcel {
*/ */
@NonNull @NonNull
public <T> List<T> readParcelableList(@NonNull List<T> list, 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(list);
Objects.requireNonNull(clazz); Objects.requireNonNull(clazz);
return readParcelableListInternal(list, cl, clazz); return readParcelableListInternal(list, cl, clazz);
@@ -3856,7 +3856,7 @@ public final class Parcel {
*/ */
@NonNull @NonNull
private <T> List<T> readParcelableListInternal(@NonNull List<T> list, 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(); final int n = readInt();
if (n == -1) { if (n == -1) {
list.clear(); list.clear();