Merge "BTAudio HAL: Store factory provider handle" into tm-d1-dev (9ddc580f) · Commits · e / os / android_packages_modules_Bluetooth

system/audio_hal_interface/aidl/client_interface_aidl.cc

+10 −6

Original line number	Diff line number	Diff line
		@@ -134,8 +134,12 @@ void BluetoothAudioClientInterface::FetchAudioProvider() {
		}
		CHECK(provider_ != nullptr);

		AIBinder_linkToDeath(provider_factory->asBinder().get(),
		death_recipient_.get(), this);
		binder_status_t binder_status = AIBinder_linkToDeath(
		provider_factory->asBinder().get(), death_recipient_.get(), this);
		if (binder_status != STATUS_OK) {
		LOG(ERROR) << "Failed to linkToDeath " << static_cast<int>(binder_status);
		}
		provider_factory_ = std::move(provider_factory);

		LOG(INFO) << "IBluetoothAudioProvidersFactory::openProvider() returned "
		<< provider_.get()
		@@ -151,8 +155,8 @@ BluetoothAudioSinkClientInterface::BluetoothAudioSinkClientInterface(

		BluetoothAudioSinkClientInterface::~BluetoothAudioSinkClientInterface() {
		if (provider_ != nullptr) {
		AIBinder_unlinkToDeath(provider_->asBinder().get(), death_recipient_.get(),
		nullptr);
		AIBinder_unlinkToDeath(provider_factory_->asBinder().get(),
		death_recipient_.get(), nullptr);
		}
		}

		@@ -165,8 +169,8 @@ BluetoothAudioSourceClientInterface::BluetoothAudioSourceClientInterface(

		BluetoothAudioSourceClientInterface::~BluetoothAudioSourceClientInterface() {
		if (provider_ != nullptr) {
		AIBinder_unlinkToDeath(provider_->asBinder().get(), death_recipient_.get(),
		nullptr);
		AIBinder_unlinkToDeath(provider_factory_->asBinder().get(),
		death_recipient_.get(), nullptr);
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,8 @@ class BluetoothAudioClientInterface {

		std::shared_ptr<IBluetoothAudioProvider> provider_;

		std::shared_ptr<IBluetoothAudioProviderFactory> provider_factory_;

		bool session_started_;
		std::unique_ptr<DataMQ> data_mq_;