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

Commit 759c3299 authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into oc-dev

am: 58f5458e

Change-Id: I4bbb93c3f1585a0e7f07ab2cedcc2459e972c5c2
parents d9f8d918 58f5458e
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -3014,6 +3014,21 @@ sp<IEffect> AudioFlinger::createEffect(
                io = mPlaybackThreads.keyAt(0);
            }
            ALOGV("createEffect() got io %d for effect %s", io, desc.name);
        } else if (checkPlaybackThread_l(io) != nullptr) {
            // allow only one effect chain per sessionId on mPlaybackThreads.
            for (size_t i = 0; i < mPlaybackThreads.size(); i++) {
                const audio_io_handle_t checkIo = mPlaybackThreads.keyAt(i);
                if (io == checkIo) continue;
                const uint32_t sessionType =
                        mPlaybackThreads.valueAt(i)->hasAudioSession(sessionId);
                if ((sessionType & ThreadBase::EFFECT_SESSION) != 0) {
                    ALOGE("%s: effect %s io %d denied because session %d effect exists on io %d",
                            __func__, desc.name, (int)io, (int)sessionId, (int)checkIo);
                    android_errorWriteLog(0x534e4554, "123237974");
                    lStatus = BAD_VALUE;
                    goto Exit;
                }
            }
        }
        ThreadBase *thread = checkRecordThread_l(io);
        if (thread == NULL) {