commit cf91618eec8f916e2b085ac36b297d8c70db288b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 27 09:35:59 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 27 09:35:59 2021 +0000
tree 9db468f92be10acec6b787093704fa5cdb5bd205
parent 98c362fdd50e33e884590f3f12124a5e615d1815
parent 991cfb08051f98b0d28733efda98c96fe1c76e2e

Merge changes I2bb2cb29,Ie52ebe19 am: 991cfb0805

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1561121

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If876225abf44b69ba31f57df0a93e91c14bef4d0

services/audioflinger/PatchPanel.cpp

diff --git a/services/audioflinger/PatchPanel.cpp b/services/audioflinger/PatchPanel.cpp
index d3a1d56..37aa13e 100644
--- a/services/audioflinger/PatchPanel.cpp
+++ b/services/audioflinger/PatchPanel.cpp
@@ -413,10 +413,10 @@
         *handle = (audio_patch_handle_t) mAudioFlinger.nextUniqueId(AUDIO_UNIQUE_ID_USE_PATCH);
         newPatch.mHalHandle = halHandle;
         mAudioFlinger.mDeviceEffectManager.createAudioPatch(*handle, newPatch);
-        mPatches.insert(std::make_pair(*handle, std::move(newPatch)));
         if (insertedModule != AUDIO_MODULE_HANDLE_NONE) {
             addSoftwarePatchToInsertedModules(insertedModule, *handle, &newPatch.mAudioPatch);
         }
+        mPatches.insert(std::make_pair(*handle, std::move(newPatch)));
     } else {
         newPatch.clearConnections(this);
     }