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

Commit 04b72a2c authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audio: Adjust after "bus" device type change" into main am: a0df7311... 

Merge "audio: Adjust after "bus" device type change" into main am: a0df7311 am: 727289b3 am: 2f397365

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



Change-Id: I50e5c1f17014823891bf59542066bc13547c2198
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c285d7f 2f397365

audio/aidl/default/primary/StreamPrimary.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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(