From 0641e854a6a6e95f3e6d28eb98f06af37f7e3a2a Mon Sep 17 00:00:00 2001
From: Hao Ke <haok@google.com>
Date: Thu, 24 Feb 2022 22:31:11 +0000
Subject: [PATCH] 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
---
 core/api/current.txt             | 2 +-
 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 b5066d9a8cb0d..c7392ea86d454 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 d3b35a032aff4..d52b92948070b 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -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();