commit | a88a7479c96e92eca841001744cccb6f9e314c4a | [log] [tgz] |
---|---|---|
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Sep 13 19:43:15 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 13 19:43:15 2023 +0000 |
tree | 9912f490414120c72d985c31891c9991d8b8dc1b | |
parent | e729663fe049d98fb55deacbabdcb18439862490 [diff] | |
parent | 54e9db25c3d355aa4952263c5511e23762cc9740 [diff] |
Merge "AHAL: fix stack overflow when connecting usb device." into main am: d105a13b24 am: 7a47d43c4b am: 54e9db25c3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2748878 Change-Id: I72b8ef3b5721be8e953a247cad84d8adecb132a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/default/usb/StreamUsb.cpp b/audio/aidl/default/usb/StreamUsb.cpp index b60b4fd..9b10432 100644 --- a/audio/aidl/default/usb/StreamUsb.cpp +++ b/audio/aidl/default/usb/StreamUsb.cpp
@@ -52,7 +52,7 @@ } connectedDeviceProfiles.push_back(*profile); } - RETURN_STATUS_IF_ERROR(setConnectedDevices(connectedDevices)); + RETURN_STATUS_IF_ERROR(StreamCommonImpl::setConnectedDevices(connectedDevices)); std::lock_guard guard(mLock); mConnectedDeviceProfiles = std::move(connectedDeviceProfiles); mConnectedDevicesUpdated.store(true, std::memory_order_release);