commit 32465dd9ae23c8c2a7953472bab240defeb0aeda
author Evan Chen <evanxinchen@google.com> Sat Nov 30 03:57:15 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 30 03:57:15 2024 +0000
tree 15f8f4bfb85c4a6157d6f928956a4ae875706254
parent 1039d29d3700f85c37b9b4ae360f873011ed50dd
parent e2d2a00c06ba1b9ef216150b357e2cb5f89788ef

Merge "Fix bad parcelable for deviceId" into main

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;