Merge "SpatializerHelper: Fix addCompatibleAudioDevice, removeCompatibleAudioDevice" into tm-dev
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user