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

Commit e2d2a00c authored by Evan Chen's avatar Evan Chen
Browse files

Fix bad parcelable for deviceId 

Test: cts
bug: 381467888, 381419304, 381347949
Flag: EXEMPT trivial bugfix

Change-Id: I900d062e55c24db6589b395639e2d798f061fe2f
parent 7879f67a

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;