Merge "Replace untyped Parcel read/write"

4 files changed, 8 insertions, 8 deletions

diff --git a/core/java/android/content/pm/InstantAppIntentFilter.java b/core/java/android/content/pm/InstantAppIntentFilter.java
index 7c63406f1d09..123d2ba5aa8d 100644
--- a/core/java/android/content/pm/InstantAppIntentFilter.java
+++ b/core/java/android/content/pm/InstantAppIntentFilter.java
@@ -46,7 +46,7 @@ public final class InstantAppIntentFilter implements Parcelable {
 
     InstantAppIntentFilter(Parcel in) {
         mSplitName = in.readString();
-        in.readList(mFilters, null /*loader*/);
+        in.readList(mFilters, getClass().getClassLoader());
     }
 
     public String getSplitName() {
diff --git a/core/java/android/content/pm/InstantAppResolveInfo.java b/core/java/android/content/pm/InstantAppResolveInfo.java
index 4c963a6534b7..98815647f0c3 100644
--- a/core/java/android/content/pm/InstantAppResolveInfo.java
+++ b/core/java/android/content/pm/InstantAppResolveInfo.java
@@ -143,7 +143,7 @@ public final class InstantAppResolveInfo implements Parcelable {
             mDigest = in.readParcelable(null /*loader*/);
             mPackageName = in.readString();
             mFilters = new ArrayList<>();
-            in.readList(mFilters, null /*loader*/);
+            in.readTypedList(mFilters, InstantAppIntentFilter.CREATOR);
             mVersionCode = in.readLong();
         }
     }
@@ -204,7 +204,7 @@ public final class InstantAppResolveInfo implements Parcelable {
         }
         out.writeParcelable(mDigest, flags);
         out.writeString(mPackageName);
-        out.writeList(mFilters);
+        out.writeTypedList(mFilters);
         out.writeLong(mVersionCode);
     }
 
diff --git a/core/java/android/window/TransitionInfo.java b/core/java/android/window/TransitionInfo.java
index c2ffc03b6119..7208930c0b20 100644
--- a/core/java/android/window/TransitionInfo.java
+++ b/core/java/android/window/TransitionInfo.java
@@ -140,7 +140,7 @@ public final class TransitionInfo implements Parcelable {
     private TransitionInfo(Parcel in) {
         mType = in.readInt();
         mFlags = in.readInt();
-        in.readList(mChanges, null /* classLoader */);
+        in.readTypedList(mChanges, Change.CREATOR);
         mRootLeash = new SurfaceControl();
         mRootLeash.readFromParcel(in);
         mRootOffset.readFromParcel(in);
@@ -152,7 +152,7 @@ public final class TransitionInfo implements Parcelable {
     public void writeToParcel(@NonNull Parcel dest, int flags) {
         dest.writeInt(mType);
         dest.writeInt(mFlags);
-        dest.writeList(mChanges);
+        dest.writeTypedList(mChanges);
         mRootLeash.writeToParcel(dest, flags);
         mRootOffset.writeToParcel(dest, flags);
         dest.writeTypedObject(mOptions, flags);
diff --git a/core/java/android/window/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java
index 9d6488d7aa14..00bc202b001a 100644
--- a/core/java/android/window/WindowContainerTransaction.java
+++ b/core/java/android/window/WindowContainerTransaction.java
@@ -61,7 +61,7 @@ public final class WindowContainerTransaction implements Parcelable {
 
     private WindowContainerTransaction(Parcel in) {
         in.readMap(mChanges, null /* loader */);
-        in.readList(mHierarchyOps, null /* loader */);
+        in.readTypedList(mHierarchyOps, HierarchyOp.CREATOR);
         mErrorCallbackToken = in.readStrongBinder();
         mTaskFragmentOrganizer = ITaskFragmentOrganizer.Stub.asInterface(in.readStrongBinder());
     }
@@ -642,7 +642,7 @@ public final class WindowContainerTransaction implements Parcelable {
     /** @hide */
     public void writeToParcel(@NonNull Parcel dest, int flags) {
         dest.writeMap(mChanges);
-        dest.writeList(mHierarchyOps);
+        dest.writeTypedList(mHierarchyOps);
         dest.writeStrongBinder(mErrorCallbackToken);
         dest.writeStrongInterface(mTaskFragmentOrganizer);
     }
@@ -915,7 +915,7 @@ public final class WindowContainerTransaction implements Parcelable {
      * Changes because they must be executed in the same order that they are added.
      * @hide
      */
-    public static class HierarchyOp implements Parcelable {
+    public static final class HierarchyOp implements Parcelable {
         public static final int HIERARCHY_OP_TYPE_REPARENT = 0;
         public static final int HIERARCHY_OP_TYPE_REORDER = 1;
         public static final int HIERARCHY_OP_TYPE_CHILDREN_TASKS_REPARENT = 2;