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

Commit cb40a0b5 authored by Joe Antonetti's avatar Joe Antonetti Committed by Android (Google) Code Review
Browse files

Merge "[Handoff][1/N] Fix Parceling of App Icon" into main

parents 6c76dfe7 a98c1a63

core/java/android/companion/datatransfer/continuity/RemoteTask.java

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public final class RemoteTask implements Parcelable { 
        mSourceDeviceName = in.readString();

        mLastUsedTimestampMillis = in.readLong();

        if (in.readInt() != 0) {

            mIcon = in.readParcelable(Icon.class.getClassLoader(), Icon.class);

            mIcon = in.readParcelable(Icon.class.getClassLoader(), android.graphics.drawable.Icon.class);

        } else {

            mIcon = null;

        }
@@ -186,7 +186,7 @@ public final class RemoteTask implements Parcelable { 
        dest.writeLong(mLastUsedTimestampMillis);

        if (mIcon != null) {

            dest.writeInt(1);

            mIcon.writeToParcel(dest, flags);

            dest.writeParcelable(mIcon, flags);

        } else {

            dest.writeInt(0);

        }