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

Commit fbc83c4b authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audioflinger: fix mmap rerouting on track invalidation"

parents 60a06ddd 039c24a2
Loading
Loading
Loading
Loading
+11 −17
Original line number Diff line number Diff line
@@ -10308,29 +10308,23 @@ status_t AudioFlinger::MmapThread::checkEffectCompatibility_l(

void AudioFlinger::MmapThread::checkInvalidTracks_l()
{
    std::vector<audio_port_handle_t> invalidPortIds;
    sp<MmapStreamCallback> callback;
    for (const sp<MmapTrack> &track : mActiveTracks) {
        if (track->isInvalid()) {
            invalidPortIds.push_back(track->portId());
        }
    }
    if (invalidPortIds.empty()) {
        return;
    }
    sp<MmapStreamCallback> callback = mCallback.promote();
    if (callback == nullptr) {
        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++;
            }
        return;
            break;
        }
    mLock.unlock();
    for (const auto invalidPortId : invalidPortIds) {
        callback->onTearDown(invalidPortId);
    }
    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)
{