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

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

Merge "audio: applyStreamVolumes when return by unsupported device" into main... 

Merge "audio: applyStreamVolumes when return by unsupported device" into main am: 89f3a6fe am: d1fb0068

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



Change-Id: I013fe0805cbfabf2a7461ee290eb2ad261494543
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ba332a46 d1fb0068

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −0
Original line number Diff line number Diff line
@@ -8193,6 +8193,7 @@ uint32_t AudioPolicyManager::setOutputDevices(const char *caller, 
              devices.toString().c_str());

        // restore previous device after evaluating strategy mute state

        outputDesc->setDevices(prevDevices);

        applyStreamVolumes(outputDesc, prevDevices.types(), delayMs, true /*force*/);

        return muteWaitMs;

    }