audio flinger: fix use of local variable after std:move
Fix potential problem introduced by commit 74c38dc7
Bug: 139894721
Test: atest AudioTrackTest
Test: atest RoutingTest
Test: atest AudioPolicyManagerTestMsd
Change-Id: I2bb2cb29e872115d6448dfbeb7d957c52f56289a
Merged-In: I2bb2cb29e872115d6448dfbeb7d957c52f56289a
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);
}