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

Commit bb990f23 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Fix code issues in APM found with unit tests 

A couple of issues resulted from refactoring done without
adequate test support. These issues were found with unit
tests being added.

Bug: 215794103
Test: atest audiosystem_tests audiorecord_tests
Change-Id: If6c55a2471ff6f21872ec5fa915592a713f244a5
parent e2f4f1ce

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);