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

Commit 671b88bf authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Icfaa316b,Ic26706d7 into main 

* changes:
  Add missing libc++ includes
  No need to modify acc for std::accumulate
parents 43609acf 4891ece5

automotive/audiocontrol/aidl/default/AudioControl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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);

                           });

}

wifi/netlinkinterceptor/aidl/default/InterceptorRelay.h

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <libnl++/Socket.h>



#include <atomic>

#include <mutex>

#include <thread>