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

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

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

parents 3c4f4a54 8b648e59

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+9 −1
Original line number Diff line number Diff line
@@ -8093,6 +8093,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,
@@ -8117,7 +8120,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;

    }