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

Commit 5f829dea authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix direct/offload thread output devices into MSD" am: 24c46f17 

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

Change-Id: I9c3abaee9e70d0acf7dba5518caee8ae52bcde84
parents 5508d92e 24c46f17

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+6 −0
Original line number Diff line number Diff line
@@ -5266,6 +5266,12 @@ DeviceVector AudioPolicyManager::getNewOutputDevices(const sp<SwAudioOutputDescr 
        }

    }



    // Do not retrieve engine device for outputs through MSD

    // TODO: support explicit routing requests by resetting MSD patch to engine device.

    if (outputDesc->devices() == getMsdAudioOutDevices()) {

        return outputDesc->devices();

    }



    // Honor explicit routing requests only if no client using default routing is active on this

    // input: a specific app can not force routing for other apps by setting a preferred device.

    bool active; // unused

services/audiopolicy/tests/AudioPolicyManagerTestClient.h

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ public: 
    status_t createAudioPatch(const struct audio_patch *patch,

                              audio_patch_handle_t *handle,

                              int /*delayMs*/) override {

        auto iter = mActivePatches.find(*handle);

        if (iter != mActivePatches.end()) {

            mActivePatches.erase(*handle);

        }

        *handle = mNextPatchHandle++;

        mActivePatches.insert(std::make_pair(*handle, *patch));

        return NO_ERROR;