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

Commit a95a60fa authored by Vlad Popa's avatar Vlad Popa Committed by Android Build Coastguard Worker
Browse files

Only apply volumes for active devices 

When the currently active device is not an absolute volume device and
the contextual bt stream changes do not apply the new volumes.

Test: repro steps in bug
Bug: 379009970
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d8d894e8cfc5013c91cfb8b33a87ec3a6f04003)
Merged-In: If0645ffd0271927b135b72fd36dc87ab0752bf44
Change-Id: If0645ffd0271927b135b72fd36dc87ab0752bf44
parent a3f99f51

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+13 −7
Original line number Diff line number Diff line
@@ -3571,23 +3571,30 @@ status_t AudioPolicyManager::setDeviceAbsoluteVolumeEnabled(audio_devices_t devi 
            return BAD_VALUE;

        }



        if (mAbsoluteVolumeDrivingStreams[deviceType] != attributesToDriveAbs) {

        const auto attrIt = mAbsoluteVolumeDrivingStreams.find(deviceType);

        if (attrIt == mAbsoluteVolumeDrivingStreams.end() ||

            (attrIt->second.usage != attributesToDriveAbs.usage ||

             attrIt->second.content_type != attributesToDriveAbs.content_type ||

             attrIt->second.flags != attributesToDriveAbs.flags)) {

            mAbsoluteVolumeDrivingStreams[deviceType] = attributesToDriveAbs;

            changed = true;

        }

    } else {

        if (mAbsoluteVolumeDrivingStreams.find(deviceType) != mAbsoluteVolumeDrivingStreams.end()) {

            mAbsoluteVolumeDrivingStreams.erase(deviceType);

        if (mAbsoluteVolumeDrivingStreams.erase(deviceType) != 0) {

            changed = true;

        }

    }



    // if something changed, apply the stream volumes regarding the new absolute mode to all the

    // outputs without any delay

    const DeviceVector devices = mEngine->getOutputDevicesForAttributes(

            attributesToDriveAbs, nullptr /* preferredDevice */, true /* fromCache */);

    changed &= devices.types().contains(deviceType);

    // if something changed on the output device for the changed attributes, apply the stream

    // volumes regarding the new absolute mode to all the outputs without any delay

    if (changed) {

        for (size_t i = 0; i < mOutputs.size(); i++) {

            sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);

            ALOGV("%s: apply stream volumes for portId %d", __func__, desc->getId());

            ALOGI("%s: apply stream volumes for portId %d and device type %d", __func__,

                  desc->getId(), deviceType);

            applyStreamVolumes(desc, {deviceType});

        }

    }
@@ -8639,7 +8646,6 @@ bool AudioPolicyManager::isVolumeConsistentForCalls(VolumeSource volumeSource, 
    const bool isHAUsed = isHearingAidUsedForComm();



    if (com_android_media_audio_replace_stream_bt_sco()) {

        ALOGV("%s stream bt sco is replaced, no volume consistency check for calls", __func__);

        isBtScoVolSrc = (volumeSource != VOLUME_SOURCE_NONE) && (callVolSrc == volumeSource) &&

                        (isScoRequested || isHAUsed);

        return true;