summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/companion/AssociationInfo.java4
1 files 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;