commit fd93c075bdb8d5ceb02568df61f372e637cf1c0d
author Andy Hung <hunga@google.com> Wed Apr 10 21:28:18 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 10 21:28:18 2019 -0700
tree fb0916a70ad148fb4826b733a8e8f863d7a38fc9
parent ceb63ffd42b1690bacebe2a9f2d353a866e307c0
parent 11de5b4bd61a9e56838dcaeed21d3cb4f50fb033

Merge changes from topic "am-f4faa2c1-7416-4076-9f85-b0cd734dba65" into oc-dev am: 58f5458e2e am: 759c3299f0
am: 11de5b4bd6

Change-Id: I74050b50b46591d06d652f8a4b3a9701e5ce8038

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index bc1654e..c77d082 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3134,6 +3134,21 @@
                 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) {