tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Icfaa316b,Ic26706d7 into main am: 671b88bf73 am: 02e41b2f79

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2902174

Change-Id: I8d274fbbd050f726f77fe12013285dd63710f181
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-01-09 23:35:31 +00:00 committed by Automerger Merge Worker
commit 8dbed42cc2
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
automotive/audiocontrol/aidl/default/AudioControl.cpp
View file

@ -244,15 +244,15 @@ ndk::ScopedAStatus AudioControl::onDevicesToMuteChange(
template <typename aidl_type>
static inline std::string toString(const std::vector<aidl_type>& in_values) {
return std::accumulate(std::begin(in_values), std::end(in_values), std::string{},
[](std::string& ls, const aidl_type& rs) {
return ls += (ls.empty() ? "" : ",") + rs.toString();
[](const std::string& ls, const aidl_type& rs) {
return ls + (ls.empty() ? "" : ",") + rs.toString();
});
}
template <typename aidl_enum_type>
static inline std::string toEnumString(const std::vector<aidl_enum_type>& in_values) {
return std::accumulate(std::begin(in_values), std::end(in_values), std::string{},
[](std::string& ls, const aidl_enum_type& rs) {
return ls += (ls.empty() ? "" : ",") + toString(rs);
[](const std::string& ls, const aidl_enum_type& rs) {
return ls + (ls.empty() ? "" : ",") + toString(rs);
});
}

1
wifi/netlinkinterceptor/aidl/default/InterceptorRelay.h
View file

@ -18,6 +18,7 @@
#include <libnl++/Socket.h>
#include <atomic>
#include <mutex>
#include <thread>