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

Commit e08ec5fa authored by Hao Ke's avatar Hao Ke Committed by Android (Google) Code Review
Browse files

Merge "Replace untyped Parcel read/write"

parents f98c930e bc841615

core/java/android/content/pm/InstantAppIntentFilter.java

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

core/java/android/content/pm/InstantAppResolveInfo.java

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

    }

core/java/android/window/TransitionInfo.java

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

core/java/android/window/WindowContainerTransaction.java

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