commit d9f8d9181ae5b6ca11bfe498b16d08283f91fb8d
author Andy Hung <hunga@google.com> Wed Apr 10 17:15:10 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 10 17:15:10 2019 -0700
tree 75d1c5806c92ab50c169475ed6a4dfb43d7d89fe
parent 8194f1d2205c0416c50fa28efcb26528acaa2864
parent eedc6cb6579bec21808697d42bb705967c6b0500

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

Change-Id: I526df7dbc1ac8e7de1797f9f74b65250621263e9

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 23cdf7c..90ab972 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2982,9 +2982,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) {