Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6374f7e authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "SpatializerHelper: Fix addCompatibleAudioDevice,... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18194572



Change-Id: I91015f24a1103b7c67e8324347d0486336226abe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 631c400e 46e3f921

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -486,8 +486,7 @@ public class SpatializerHelper { 




        for (SADeviceState deviceState : mSADevices) {

        for (SADeviceState deviceState : mSADevices) {

            if (deviceType == deviceState.mDeviceType

            if (deviceType == deviceState.mDeviceType

                    && (wireless && ada.getAddress().equals(deviceState.mDeviceAddress))

                    && (!wireless || ada.getAddress().equals(deviceState.mDeviceAddress))) {

                    || !wireless) {

                isInList = true;

                isInList = true;

                if (forceEnable) {

                if (forceEnable) {

                    deviceState.mEnabled = true;

                    deviceState.mEnabled = true;
@@ -511,8 +510,7 @@ public class SpatializerHelper { 




        for (SADeviceState deviceState : mSADevices) {

        for (SADeviceState deviceState : mSADevices) {

            if (deviceType == deviceState.mDeviceType

            if (deviceType == deviceState.mDeviceType

                    && (wireless && ada.getAddress().equals(deviceState.mDeviceAddress))

                    && (!wireless || ada.getAddress().equals(deviceState.mDeviceAddress))) {

                    || !wireless) {

                deviceState.mEnabled = false;

                deviceState.mEnabled = false;

                break;

                break;

            }

            }