Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d47e457b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I7310de0261117ca29531545e9a972f1bb475245f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59c17004 79ff7cde

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −3
Original line number Diff line number Diff line
@@ -459,9 +459,9 @@ status_t AudioPolicyManager::setDeviceConnectionStateInt(const sp<DeviceDescript 
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,