commit 46e3f9217153cfa271ab3f31046ade20c675af7d
author Andy Hung <hunga@google.com> Fri May 06 16:27:05 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 06 16:27:05 2022 +0000
tree 5306c254cab488247375bf2aa24440c63cbbc5c0
parent 876ce10505d88b64d5a6df2513b2049b9860bca1
parent c3f288773fd0f0a0c5abe972a2b29ae664c5d240

Merge "SpatializerHelper: Fix addCompatibleAudioDevice, removeCompatibleAudioDevice" into tm-dev

services/core/java/com/android/server/audio/SpatializerHelper.java

diff --git a/services/core/java/com/android/server/audio/SpatializerHelper.java b/services/core/java/com/android/server/audio/SpatializerHelper.java
index 122a950..d8aa9aa 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 @@
 
         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 @@
 
         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;
             }