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

Commit 0641e854 authored by Hao Ke's avatar Hao Ke
Browse files

Changing readParcelableList's API. 

Signature of readParcelableList() new API is inconsistent with rest,
Changing it to allow using Child class as the required type.

Bug: 221069460
Test: Build and boot.
Change-Id: Ic01c9c8011977d75e3be73f55597dd1bfcd524da
parent ee8e50ac

core/api/current.txt

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

core/java/android/os/Parcel.java

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