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

Commit 809acee9 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

audio policy: fix media volume after ringtone am: 57de36cc 

am: f3ef8248

Change-Id: I7893c08978caf6ada73b5449ec3e1bcead96f9c1
parents 7ab345b9 f3ef8248

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1326,6 +1326,7 @@ status_t AudioPolicyManager::stopSource(const sp<AudioOutputDescriptor>& outputD 


            // force restoring the device selection on other active outputs if it differs from the

            // one being selected for this output

            uint32_t delayMs = outputDesc->latency()*2;

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

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

                if (desc != outputDesc &&
@@ -1337,7 +1338,11 @@ status_t AudioPolicyManager::stopSource(const sp<AudioOutputDescriptor>& outputD 
                    setOutputDevice(desc,

                                    newDevice2,

                                    force,

                                    outputDesc->latency()*2);

                                    delayMs);

                    // re-apply device specific volume if not done by setOutputDevice()

                    if (!force) {

                        applyStreamVolumes(desc, newDevice2, delayMs);

                    }

                }

            }

            // update the outputs if stopping one with a stream that can affect notification routing