Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 21:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic8efc0c90748ee2a18e324cbebacbfd03063422e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mikhail Naganov
2023-12-05 20:06:55 +00:00
committed by Automerger Merge Worker
parent 213319e3f7 727289b30d
commit 2f397365a6
1 changed files with 4 additions and 4 deletions
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);
return kSimulateInput || device.type.type == AudioDeviceType::IN_TELEPHONY_RX ||
device.type.type == AudioDeviceType::IN_FM_TUNER ||
device.type.connection == AudioDeviceDescription::CONNECTION_BUS ||
(device.type.type == AudioDeviceType::IN_DEVICE && device.type.connection.empty());
device.type.connection == AudioDeviceDescription::CONNECTION_BUS /*deprecated */ ||
(device.type.type == AudioDeviceType::IN_BUS && device.type.connection.empty());
}
StreamSwitcher::DeviceSwitchBehavior StreamInPrimary::switchCurrentStream(
@@ -188,8 +188,8 @@ bool StreamOutPrimary::useStubStream(const AudioDevice& device) {
static const bool kSimulateOutput =
GetBoolProperty("ro.boot.audio.tinyalsa.ignore_output", false);
return kSimulateOutput || device.type.type == AudioDeviceType::OUT_TELEPHONY_TX ||
device.type.connection == AudioDeviceDescription::CONNECTION_BUS ||
(device.type.type == AudioDeviceType::OUT_DEVICE && device.type.connection.empty());
device.type.connection == AudioDeviceDescription::CONNECTION_BUS /*deprecated*/ ||
(device.type.type == AudioDeviceType::OUT_BUS && device.type.connection.empty());
}
StreamSwitcher::DeviceSwitchBehavior StreamOutPrimary::switchCurrentStream(