commit 982757d4e838f368a800023b5052dd3328c1ce77
author Angela Wang <angelala@google.com> Sat Nov 30 05:26:07 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Nov 30 05:26:07 2024 +0000
tree 7f40e3a783d8ca8aa6059737cb05c28602f8d24b
parent 32465dd9ae23c8c2a7953472bab240defeb0aeda
parent 3b74adc96aa256207f961dcb3843764e2741c67b

Merge "Integrate `getAudioInputControlPoints()` into SettingsLib" 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;