commit e2d2a00c06ba1b9ef216150b357e2cb5f89788ef
author Evan Chen <evanxinchen@google.com> Fri Nov 29 19:33:24 2024 +0000
committer Evan Chen <evanxinchen@google.com> Sat Nov 30 02:28:50 2024 +0000
tree 71af577e12e95df66645df584f1b8cb8cda453b5
parent 7879f67a36ce83f8e660008d6a7ab5bb232c9e1a

Fix bad parcelable for deviceId

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

Change-Id: I900d062e55c24db6589b395639e2d798f061fe2f

core/java/android/companion/AssociationInfo.java

diff --git a/core/java/android/companion/AssociationInfo.java b/core/java/android/companion/AssociationInfo.java
index 2e108a1..2f16115 100644
--- a/core/java/android/companion/AssociationInfo.java
+++ b/core/java/android/companion/AssociationInfo.java
@@ -460,8 +460,8 @@
         } 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;