From e2d2a00c06ba1b9ef216150b357e2cb5f89788ef Mon Sep 17 00:00:00 2001
From: Evan Chen <evanxinchen@google.com>
Date: Fri, 29 Nov 2024 19:33:24 +0000
Subject: Fix bad parcelable for deviceId

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

Change-Id: I900d062e55c24db6589b395639e2d798f061fe2f
---
 core/java/android/companion/AssociationInfo.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/companion/AssociationInfo.java b/core/java/android/companion/AssociationInfo.java
index 2e108a1eed2c..2f161150a89b 100644
--- a/core/java/android/companion/AssociationInfo.java
+++ b/core/java/android/companion/AssociationInfo.java
@@ -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;
-- 
cgit v1.2.3-59-g8ed1b