commit d47e457be2e0fa6d2450f473909d961787fbc7cc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 18 23:16:11 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 18 23:16:11 2023 +0000
tree 13439bd227d9057583e6cfd213c7de98beab13e7
parent 59c1700455956b23f18b85d434a45db7311cbfee
parent 79ff7cde129d33b27bae6b794374c0c9cbf66616

Merge "AudioPolicyManager: Fix memory leak" into main am: 79ff7cde12

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

Change-Id: I7310de0261117ca29531545e9a972f1bb475245f
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 ba31866..cc32aec 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,