From 21c87709236c20b655a510588d1ca468fc2eedf4 Mon Sep 17 00:00:00 2001 From: Weilin Xu Date: Wed, 2 Oct 2024 19:35:32 +0000 Subject: [PATCH] Enable bus device audio in default audio HAL Bug: 336370745 Test: atest VtsHalAudioCoreTargetTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:e9f7cf5a8495d11d92760bac5238eedb9dd5ea72) Merged-In: I7d9ab165f3208f401a9889623050374ed6aea691 Change-Id: I7d9ab165f3208f401a9889623050374ed6aea691 --- audio/aidl/default/primary/StreamPrimary.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/audio/aidl/default/primary/StreamPrimary.cpp b/audio/aidl/default/primary/StreamPrimary.cpp index abf3a731ad..801bbb8e59 100644 --- a/audio/aidl/default/primary/StreamPrimary.cpp +++ b/audio/aidl/default/primary/StreamPrimary.cpp @@ -137,8 +137,7 @@ 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 /*deprecated */ || - (device.type.type == AudioDeviceType::IN_BUS && device.type.connection.empty()); + device.type.connection == AudioDeviceDescription::CONNECTION_BUS /*deprecated */; } StreamSwitcher::DeviceSwitchBehavior StreamInPrimary::switchCurrentStream( @@ -209,8 +208,7 @@ 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 /*deprecated*/ || - (device.type.type == AudioDeviceType::OUT_BUS && device.type.connection.empty()); + device.type.connection == AudioDeviceDescription::CONNECTION_BUS /*deprecated*/; } StreamSwitcher::DeviceSwitchBehavior StreamOutPrimary::switchCurrentStream(