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

Commit 6b6d2617 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Align A2DP and speaker volume in tandem case" into main am: 1cf86140 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2932450



Change-Id: If69b45a1989b9d0f93bc725fe5186f35feaf07ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb263ea3 1cf86140

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -3265,6 +3265,7 @@ status_t AudioPolicyManager::setVolumeIndexForAttributes(const audio_attributes_ 
    // requested device or one of the devices selected by the engine for this stream

    // - For default requested device (AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME), apply volume only if

    // no specific device volume value exists for currently selected device.

    // - Only apply the volume if the requested device is the desired device for volume control.

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

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

        DeviceTypeSet curDevices = desc->devices().types();
@@ -3284,7 +3285,8 @@ status_t AudioPolicyManager::setVolumeIndexForAttributes(const audio_attributes_ 
        if (device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) {

            curSrcDevices.insert(device);

            applyVolume = (curSrcDevices.find(

                    Volume::getDeviceForVolume(curDevices)) != curSrcDevices.end());

                    Volume::getDeviceForVolume(curDevices)) != curSrcDevices.end())

                    && Volume::getDeviceForVolume(curSrcDevices) == device;

        } else {

            applyVolume = !curves.hasVolumeIndexForDevice(curSrcDevice);

        }