commit 4d36c61c005bc0f7fb6400dbc7f8bb31742ddf5b
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 27 09:59:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 27 09:59:17 2021 +0000
tree 11bd7ff9cae6ad0d5798ed26d011a07203ca68c3
parent 13b58e1dd2d5b3bf44e1dc1079639302531b1104
parent cf91618eec8f916e2b085ac36b297d8c70db288b

Merge changes I2bb2cb29,Ie52ebe19 am: 991cfb0805 am: cf91618eec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I945b8b7a4d166351e034eaa6f652b93242e5afe4

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