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

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

Merge "Fix code issues in APM found with unit tests" am: 47f6a73c 

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



Change-Id: I1317151e3a6dbd5f9fb69b51de2f5f0da1a97da5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2bdebb91 47f6a73c

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −2
Original line number Diff line number Diff line
@@ -2921,7 +2921,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);
@@ -2931,7 +2931,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);