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

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

Merge "Make error log in APM::checkAndSetVolume more useful" into main am: a20af38c 

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



Change-Id: Iafd1397df247914d1a783510c66ad31a5943d457
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 722280c4 a20af38c

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+9 −1
Original line number Diff line number Diff line
@@ -8293,6 +8293,9 @@ status_t AudioPolicyManager::checkAndSetVolume(IVolumeCurves &curves, 
                                               int delayMs,

                                               bool force)

{

    // APM is single threaded, and single instance.

    static std::set<IVolumeCurves*> invalidCurvesReported;



    // do not change actual attributes volume if the attributes is muted

    if (outputDesc->isMuted(volumeSource)) {

        ALOGVV("%s: volume source %d muted count %d active=%d", __func__, volumeSource,
@@ -8317,7 +8320,12 @@ status_t AudioPolicyManager::checkAndSetVolume(IVolumeCurves &curves, 
    }



    if (curves.getVolumeIndexMin() < 0 || curves.getVolumeIndexMax() < 0) {

        ALOGE("invalid volume index range");

        if (!invalidCurvesReported.count(&curves)) {

            invalidCurvesReported.insert(&curves);

            String8 dump;

            curves.dump(&dump);

            ALOGE("invalid volume index range in the curve:\n%s", dump.c_str());

        }

        return BAD_VALUE;

    }