Snap for 11297328 from aeba4a25d51b77b952b145ffb906b74cd981f596 to 24Q2-release (540d165c) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/include/effect-impl/EffectContext.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,14 @@ class EffectContext {
		LOG_ALWAYS_FATAL_IF(output.base.format.pcm !=
		aidl::android::media::audio::common::PcmType::FLOAT_32_BIT,
		"outputFormatNotFloat");

		size_t inputChannelCount =
		::aidl::android::hardware::audio::common::getChannelCount(input.base.channelMask);
		LOG_ALWAYS_FATAL_IF(inputChannelCount == 0, "inputChannelCountNotValid");
		size_t outputChannelCount =
		::aidl::android::hardware::audio::common::getChannelCount(output.base.channelMask);
		LOG_ALWAYS_FATAL_IF(outputChannelCount == 0, "outputChannelCountNotValid");

		mInputFrameSize = ::aidl::android::hardware::audio::common::getFrameSizeInBytes(
		input.base.format, input.base.channelMask);
		mOutputFrameSize = ::aidl::android::hardware::audio::common::getFrameSizeInBytes(

+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);
		});
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@

		#include <atomic>
		#include <chrono>
		#include <functional>
		#include <thread>

		namespace android::hardware::automotive::can::V1_0::implementation {

+1 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@

		#include <net/if.h>

		#include <atomic>
		#include <string>

		namespace android::netdevice::ifreqs {

+2 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@
		#include <linux/rtnetlink.h>
		#include <net/if.h>

		#include <algorithm>
		#include <iterator>
		#include <sstream>

		namespace android::netdevice {