From c3f288773fd0f0a0c5abe972a2b29ae664c5d240 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Thu, 5 May 2022 20:33:18 -0700 Subject: [PATCH] SpatializerHelper: Fix addCompatibleAudioDevice, removeCompatibleAudioDevice Erroneous if check caused false device matches. Test: enable/disable spatial audio wired headset in the settings Bug: 231499448 Bug: 231658188 Change-Id: I0af5db0df72c3ea964e5e6b7fe85b3a7fc9f0959 --- .../java/com/android/server/audio/SpatializerHelper.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java index 122a950e4fd37..d8aa9aa6591e8 100644 --- a/services/core/java/com/android/server/audio/SpatializerHelper.java +++ b/services/core/java/com/android/server/audio/SpatializerHelper.java @@ -486,8 +486,7 @@ public class SpatializerHelper { for (SADeviceState deviceState : mSADevices) { if (deviceType == deviceState.mDeviceType - && (wireless && ada.getAddress().equals(deviceState.mDeviceAddress)) - || !wireless) { + && (!wireless || ada.getAddress().equals(deviceState.mDeviceAddress))) { isInList = true; if (forceEnable) { deviceState.mEnabled = true; @@ -511,8 +510,7 @@ public class SpatializerHelper { for (SADeviceState deviceState : mSADevices) { if (deviceType == deviceState.mDeviceType - && (wireless && ada.getAddress().equals(deviceState.mDeviceAddress)) - || !wireless) { + && (!wireless || ada.getAddress().equals(deviceState.mDeviceAddress))) { deviceState.mEnabled = false; break; }