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

Commit eedc6cb6 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

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

* changes:
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746b am: d2967d3f am: 63539c39 am: d98b2019 am: a29ede5e
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746b am: d2967d3f am: 63539c39 am: d98b2019
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746b am: d2967d3f am: 63539c39
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746b am: d2967d3f
  [automerger] audio: ensure effect chain with specific session id is unique am: 5945746b
  audio: ensure effect chain with specific session id is unique
parents d8817bc2 e6bf186f

services/audioflinger/AudioFlinger.cpp

+6 −2
Original line number Diff line number Diff line
@@ -2996,11 +2996,15 @@ sp<IEffect> AudioFlinger::createEffect( 
            }

            // 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);

                    // thread with same effect session is preferable

                    if ((sessionType & ThreadBase::EFFECT_SESSION) != 0) {

                        break;

                    }

                }

            }

            if (io == AUDIO_IO_HANDLE_NONE) {

                for (size_t i = 0; i < mRecordThreads.size(); i++) {

                    if (mRecordThreads.valueAt(i)->hasAudioSession(sessionId) != 0) {