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

Commit 7bdbecd4 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "audioflinger: fix mmap rerouting on track invalidation" into tm-qpr-dev am: 0e695552 

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



Change-Id: I908164c9d3bfa1de0b4ab426b2b03e0665942189
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4c8fc3ff 0e695552

services/audioflinger/Threads.cpp

+10 −7
Original line number Diff line number Diff line
@@ -10240,19 +10240,22 @@ status_t AudioFlinger::MmapThread::checkEffectCompatibility_l( 


void AudioFlinger::MmapThread::checkInvalidTracks_l()

{

    sp<MmapStreamCallback> callback;

    for (const sp<MmapTrack> &track : mActiveTracks) {

        if (track->isInvalid()) {

            sp<MmapStreamCallback> callback = mCallback.promote();

            if (callback != 0) {

                mLock.unlock();

                callback->onTearDown(track->portId());

                mLock.lock();

            } else if (mNoCallbackWarningCount < kMaxNoCallbackWarnings) {

                ALOGW("Could not notify MMAP stream tear down: no onTearDown callback!");

            callback = mCallback.promote();

            if (callback == nullptr &&  mNoCallbackWarningCount < kMaxNoCallbackWarnings) {

                ALOGW("Could not notify MMAP stream tear down: no onRoutingChanged callback!");

                mNoCallbackWarningCount++;

            }

            break;

        }

    }

    if (callback != 0) {

        mLock.unlock();

        callback->onRoutingChanged(AUDIO_PORT_HANDLE_NONE);

        mLock.lock();

    }

}



void AudioFlinger::MmapThread::dumpInternals_l(int fd, const Vector<String16>& args __unused)