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

Commit db803867 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "audiopolicy: Fix after commit 11d30104"

parents 50b7ff20 2d4e170f

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -5372,7 +5372,7 @@ uint32_t AudioPolicyManager::setOutputDevices(const sp<SwAudioOutputDescriptor>& 
    //  AND force is not specified

    //  AND the output is connected by a valid audio patch.

    // Doing this check here allows the caller to call setOutputDevices() without conditions

    if ((!filteredDevices.isEmpty() || filteredDevices == prevDevices) &&

    if ((filteredDevices.isEmpty() || filteredDevices == prevDevices) &&

            !force && outputDesc->getPatchHandle() != 0) {

        ALOGV("%s setting same device %s or null device, force=%d, patch handle=%d", __func__,

              filteredDevices.toString().c_str(), force, outputDesc->getPatchHandle());