Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35ce6344 authored by Hao Ke's avatar Hao Ke Committed by Automerger Merge Worker
Browse files

Merge "Changing readParcelableList's API." am: 0b340743 am: 91117c2c 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1998972

Change-Id: If25de2f6b106e5a722965c7596d0f7f73734f55c
parents d38ca191 91117c2c

core/api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -30361,7 +30361,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();

core/java/android/os/Parcel.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -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();