commit fe668249211343df32467f3b96f96344308d0994
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Sep 19 00:52:27 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Sep 19 00:52:27 2023 +0000
tree bba5d5994008909dbd2a841ee28b167fb076b7b1
parent 7bed6b8e08e7477a6c80a19791d85c55582f1978
parent da9c476ff541e56d83b9c533cbad36bf17404d2f

Merge "AudioPolicyManager: Fix memory leak" into main am: 79ff7cde12 am: d47e457be2 am: 72eda8a5e3 am: da9c476ff5

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

Change-Id: Ief2e83b6d13391065c1191f30e95ad821d75723b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 722d1f2..878c0cd 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -459,9 +459,9 @@
 status_t AudioPolicyManager::deviceToAudioPort(audio_devices_t device, const char* device_address,
                                                const char* device_name,
                                                media::AudioPortFw* aidlPort) {
-    DeviceDescriptorBase devDescr(device, device_address);
-    devDescr.setName(device_name);
-    return devDescr.writeToParcelable(aidlPort);
+    const auto devDescr = sp<DeviceDescriptorBase>::make(device, device_address);
+    devDescr->setName(device_name);
+    return devDescr->writeToParcelable(aidlPort);
 }
 
 void AudioPolicyManager::setEngineDeviceConnectionState(const sp<DeviceDescriptor> device,