tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "audio: Adjust after "bus" device type change" into main am: a0df73110e am: 727289b30d am: 2f397365a6

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2858026

Change-Id: I50e5c1f17014823891bf59542066bc13547c2198
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov 2023-12-05 21:01:11 +00:00 committed by Automerger Merge Worker
commit 04b72a2c81
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
audio/aidl/default/primary/StreamPrimary.cpp
View file

@ -116,8 +116,8 @@ bool StreamInPrimary::useStubStream(const AudioDevice& device) {
GetBoolProperty("ro.boot.audio.tinyalsa.simulate_input", false); GetBoolProperty("ro.boot.audio.tinyalsa.simulate_input", false);
return kSimulateInput || device.type.type == AudioDeviceType::IN_TELEPHONY_RX || return kSimulateInput || device.type.type == AudioDeviceType::IN_TELEPHONY_RX ||
device.type.type == AudioDeviceType::IN_FM_TUNER || device.type.type == AudioDeviceType::IN_FM_TUNER ||
device.type.connection == AudioDeviceDescription::CONNECTION_BUS || device.type.connection == AudioDeviceDescription::CONNECTION_BUS /*deprecated */ ||
(device.type.type == AudioDeviceType::IN_DEVICE && device.type.connection.empty()); (device.type.type == AudioDeviceType::IN_BUS && device.type.connection.empty());
} }
StreamSwitcher::DeviceSwitchBehavior StreamInPrimary::switchCurrentStream( StreamSwitcher::DeviceSwitchBehavior StreamInPrimary::switchCurrentStream(
@ -188,8 +188,8 @@ bool StreamOutPrimary::useStubStream(const AudioDevice& device) {
static const bool kSimulateOutput = static const bool kSimulateOutput =
GetBoolProperty("ro.boot.audio.tinyalsa.ignore_output", false); GetBoolProperty("ro.boot.audio.tinyalsa.ignore_output", false);
return kSimulateOutput || device.type.type == AudioDeviceType::OUT_TELEPHONY_TX || return kSimulateOutput || device.type.type == AudioDeviceType::OUT_TELEPHONY_TX ||
device.type.connection == AudioDeviceDescription::CONNECTION_BUS || device.type.connection == AudioDeviceDescription::CONNECTION_BUS /*deprecated*/ ||
(device.type.type == AudioDeviceType::OUT_DEVICE && device.type.connection.empty()); (device.type.type == AudioDeviceType::OUT_BUS && device.type.connection.empty());
} }
StreamSwitcher::DeviceSwitchBehavior StreamOutPrimary::switchCurrentStream( StreamSwitcher::DeviceSwitchBehavior StreamOutPrimary::switchCurrentStream(