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

Commit 83c47537 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30443703']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30443703'] into sparse-12674724-L05800030007840432.
SPARSE_CHANGE: Ia746926472f942b3c506bf6e55d614a67ddbad1a

Change-Id: I1b77151b98731d4505eae4b9ea5d0111a6160395
parents 8002e15d db18df93

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+26 −9
Original line number Diff line number Diff line
@@ -3573,19 +3573,36 @@ status_t AudioPolicyManager::setDeviceAbsoluteVolumeEnabled(audio_devices_t devi 
    ALOGI("%s: deviceType 0x%X, enabled %d, streamToDriveAbs %d", __func__, deviceType, enabled,

          streamToDriveAbs);



    if (!enabled) {

        mAbsoluteVolumeDrivingStreams.erase(deviceType);

        return NO_ERROR;

    }



    bool changed = false;

    audio_attributes_t attributesToDriveAbs = mEngine->getAttributesForStreamType(streamToDriveAbs);

    if (enabled) {

        if (attributesToDriveAbs == AUDIO_ATTRIBUTES_INITIALIZER) {

            ALOGW("%s: no attributes for stream %s, bailing out", __func__,

                  toString(streamToDriveAbs).c_str());

            return BAD_VALUE;

        }



        if (mAbsoluteVolumeDrivingStreams[deviceType] != attributesToDriveAbs) {

            mAbsoluteVolumeDrivingStreams[deviceType] = attributesToDriveAbs;

            changed = true;

        }

    } else {

        if (mAbsoluteVolumeDrivingStreams.find(deviceType) != mAbsoluteVolumeDrivingStreams.end()) {

            mAbsoluteVolumeDrivingStreams.erase(deviceType);

            changed = true;

        }

    }



    // if something changed, apply the stream volumes regarding the new absolute mode to all the

    // outputs without any delay

    if (changed) {

        for (size_t i = 0; i < mOutputs.size(); i++) {

            sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);

            ALOGV("%s: apply stream volumes for portId %d", __func__, desc->getId());

            applyStreamVolumes(desc, {deviceType});

        }

    }



    return NO_ERROR;

}