Snap for 11373247 from ee6e1f9c70e8110a152bb1a94491cf0b9da06190 to 24Q2-release (5ac125d0) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/bluetooth/ModuleBluetooth.cpp

+7 −1

Original line number	Diff line number	Diff line
		@@ -299,7 +299,13 @@ ndk::ScopedAStatus ModuleBluetooth::createProxy(const AudioPort& audioPort, int3
		: std::shared_ptr<BluetoothAudioPortAidl>(
		std::make_shared<BluetoothAudioPortAidlOut>());
		const auto& devicePort = audioPort.ext.get<AudioPortExt::device>();
		if (const auto device = devicePort.device.type; !proxy.ptr->registerPort(device)) {
		const auto device = devicePort.device.type;
		bool registrationSuccess = false;
		for (int i = 0; i < kCreateProxyRetries && !registrationSuccess; ++i) {
		registrationSuccess = proxy.ptr->registerPort(device);
		usleep(kCreateProxyRetrySleepMs * 1000);
		}
		if (!registrationSuccess) {
		LOG(ERROR) << __func__ << ": failed to register BT port for " << device.toString();
		return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,8 @@ class ModuleBluetooth final : public Module {
		ndk::ScopedAStatus findOrCreateProxy(
		const ::aidl::android::media::audio::common::AudioPort& audioPort, CachedProxy& proxy);

		static constexpr int kCreateProxyRetries = 5;
		static constexpr int kCreateProxyRetrySleepMs = 250;
		ChildInterface<BluetoothA2dp> mBluetoothA2dp;
		ChildInterface<BluetoothLe> mBluetoothLe;
		std::map<int32_t /instantiated device port ID/, CachedProxy> mProxies;

+5 −6

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <android-base/stringprintf.h>
		#include <android-base/thread_annotations.h>
		#include <android/binder_process.h>
		#include <android/hardware/automotive/vehicle/2.0/IVehicle.h>
		#include <gmock/gmock.h>
		#include <gtest/gtest.h>
		#include <hidl/GtestPrinter.h>
		@@ -288,11 +289,8 @@ bool VtsHalAutomotiveVehicleTargetTest::isResultOkayWithValue(

		bool VtsHalAutomotiveVehicleTargetTest::isUnavailable(
		const VhalClientResult<std::unique_ptr<IHalPropValue>>& result) {
		if (result.ok()) {
		return false;
		}
		if (result.error().code() == ErrorCode::NOT_AVAILABLE_FROM_VHAL) {
		return true;
		if (!result.ok()) {
		return result.error().code() == ErrorCode::NOT_AVAILABLE_FROM_VHAL;
		}
		if (result.value() != nullptr &&
		result.value()->getStatus() == VehiclePropertyStatus::UNAVAILABLE) {
		@@ -1193,7 +1191,8 @@ std::vector<ServiceDescriptor> getDescriptors() {
		.isAidlService = true,
		});
		}
		for (std::string name : getAllHalInstanceNames(IVehicle::descriptor)) {
		for (std::string name : getAllHalInstanceNames(
		android::hardware::automotive::vehicle::V2_0::IVehicle::descriptor)) {
		descriptors.push_back({
		.name = name,
		.isAidlService = false,

+8 −0

Original line number	Diff line number	Diff line
		@@ -94,3 +94,11 @@ vintf_compatibility_matrix {
		"kernel_config_v_6.6",
		],
		}

		vintf_compatibility_matrix {
		name: "framework_compatibility_matrix.tmp.xml",
		stem: "compatibility_matrix.tmp.xml",
		srcs: [
		"compatibility_matrix.tmp.xml",
		],
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ my_system_matrix_deps := \
		# interfaces (in the `next` release configuration).
		ifeq ($(RELEASE_AIDL_USE_UNFROZEN),true)
		my_system_matrix_deps += \
		framework_compatibility_matrix.202404.xml
		framework_compatibility_matrix.202404.xml \
		framework_compatibility_matrix.tmp.xml
		endif

		my_framework_matrix_deps += \