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

Commit 3c99dbe3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['android-review.googlesource.com/3071183'] into 24Q3-release. 

Change-Id: If51bca805e7cb4549e278703fd5b2e99015d69d6
parents 2384909d 31cd3cc6

media/libaudiohal/impl/StreamHalAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ status_t StreamOutHalAidl::getLatency(uint32_t *latency) { 
status_t StreamOutHalAidl::setVolume(float left, float right) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    size_t channelCount = audio_channel_out_mask_from_count(mConfig.channel_mask);

    size_t channelCount = audio_channel_count_from_out_mask(mConfig.channel_mask);

    if (channelCount == 0) channelCount = 2;

    std::vector<float> volumes(channelCount);

    if (channelCount == 1) {