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

Commit 32465dd9 authored by Evan Chen's avatar Evan Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix bad parcelable for deviceId" into main

parents 1039d29d e2d2a00c

core/java/android/companion/AssociationInfo.java

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ public final class AssociationInfo implements Parcelable { 
        } else {

            mDeviceIcon = null;

        }



        if (Flags.associationTag() && in.readInt() == 1) {

        int deviceId = in.readInt();

        if (Flags.associationTag() && deviceId == 1) {

            mDeviceId = in.readTypedObject(DeviceId.CREATOR);

        } else {

            mDeviceId = null;