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

Commit 47f6a73c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix code issues in APM found with unit tests"

parents e2f4f1ce bb990f23

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2920,7 +2920,7 @@ status_t AudioPolicyManager::getVolumeIndexForAttributes(const audio_attributes_ 
    // stream by the engine.

    DeviceTypeSet deviceTypes = {device};

    if (device == AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) {

        DeviceTypeSet deviceTypes = mEngine->getOutputDevicesForAttributes(

        deviceTypes = mEngine->getOutputDevicesForAttributes(

                attr, nullptr, true /*fromCache*/).types();

    }

    return getVolumeIndex(getVolumeCurves(attr), index, deviceTypes);
@@ -2930,7 +2930,7 @@ status_t AudioPolicyManager::getVolumeIndex(const IVolumeCurves &curves, 
                                            int &index,

                                            const DeviceTypeSet& deviceTypes) const

{

    if (isSingleDeviceType(deviceTypes, audio_is_output_device)) {

    if (!isSingleDeviceType(deviceTypes, audio_is_output_device)) {

        return BAD_VALUE;

    }

    index = curves.getVolumeIndex(deviceTypes);