commit baee23668b1037a71d3d596911acdf4caffb84fd
author Andy Hung <hunga@google.com> Wed Apr 10 19:09:49 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 10 19:09:49 2019 -0700
tree 1944da50ec67f6f9a9f884d39b4cc1d71ea2bdf0
parent 597ba8081bf93511acab3a29390ebda084c558a3
parent d9f8d9181ae5b6ca11bfe498b16d08283f91fb8d

Merge changes from topic "am-99626481-1222-4690-a6c3-4a3db61755f9" into oc-dev am: eedc6cb657
am: d9f8d9181a

Change-Id: I1d10926666edae08ee5376ffb08e6bd8362b540e

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 3b90073..507da23 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2987,9 +2987,13 @@
             }
             // look for the thread where the specified audio session is present
             for (size_t i = 0; i < mPlaybackThreads.size(); i++) {
-                if (mPlaybackThreads.valueAt(i)->hasAudioSession(sessionId) != 0) {
+                uint32_t sessionType = mPlaybackThreads.valueAt(i)->hasAudioSession(sessionId);
+                if (sessionType != 0) {
                     io = mPlaybackThreads.keyAt(i);
-                    break;
+                    // thread with same effect session is preferable
+                    if ((sessionType & ThreadBase::EFFECT_SESSION) != 0) {
+                        break;
+                    }
                 }
             }
             if (io == AUDIO_IO_HANDLE_NONE) {