117 lines
5.3 KiB
Diff
117 lines
5.3 KiB
Diff
From 1e1aee85f08b67be4b8805c9c0727ce826b0793a Mon Sep 17 00:00:00 2001
|
|
From: Peter Cai <peter@typeblog.net>
|
|
Date: Wed, 24 Aug 2022 15:45:18 -0400
|
|
Subject: [PATCH 2/3] audio_hal_interface: Optionally use sysbta HAL
|
|
|
|
Required to support sysbta, our system-side bt audio implementation.
|
|
|
|
Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860
|
|
---
|
|
.../audio_hal_interface/aidl/client_interface_aidl.cc | 6 +++---
|
|
.../audio_hal_interface/aidl/client_interface_aidl.h | 7 +++++++
|
|
system/audio_hal_interface/hal_version_manager.cc | 11 +++++++++--
|
|
3 files changed, 19 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.cc b/system/audio_hal_interface/aidl/client_interface_aidl.cc
|
|
index 9faa725022..f6706d98f1 100644
|
|
--- a/system/audio_hal_interface/aidl/client_interface_aidl.cc
|
|
+++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc
|
|
@@ -58,7 +58,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface(
|
|
|
|
bool BluetoothAudioClientInterface::is_aidl_available() {
|
|
return AServiceManager_isDeclared(
|
|
- kDefaultAudioProviderFactoryInterface.c_str());
|
|
+ audioProviderFactoryInterface().c_str());
|
|
}
|
|
|
|
std::vector<AudioCapabilities>
|
|
@@ -74,7 +74,7 @@ BluetoothAudioClientInterface::GetAudioCapabilities(SessionType session_type) {
|
|
}
|
|
auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
|
|
::ndk::SpAIBinder(AServiceManager_waitForService(
|
|
- kDefaultAudioProviderFactoryInterface.c_str())));
|
|
+ audioProviderFactoryInterface().c_str())));
|
|
|
|
if (provider_factory == nullptr) {
|
|
LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
|
|
@@ -101,7 +101,7 @@ void BluetoothAudioClientInterface::FetchAudioProvider() {
|
|
}
|
|
auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
|
|
::ndk::SpAIBinder(AServiceManager_waitForService(
|
|
- kDefaultAudioProviderFactoryInterface.c_str())));
|
|
+ audioProviderFactoryInterface().c_str())));
|
|
|
|
if (provider_factory == nullptr) {
|
|
LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
|
|
diff --git a/system/audio_hal_interface/aidl/client_interface_aidl.h b/system/audio_hal_interface/aidl/client_interface_aidl.h
|
|
index 0dd9575acb..d28e8e46fb 100644
|
|
--- a/system/audio_hal_interface/aidl/client_interface_aidl.h
|
|
+++ b/system/audio_hal_interface/aidl/client_interface_aidl.h
|
|
@@ -28,6 +28,7 @@
|
|
#include "bluetooth_audio_port_impl.h"
|
|
#include "common/message_loop_thread.h"
|
|
#include "transport_instance.h"
|
|
+#include "osi/include/properties.h"
|
|
|
|
#define BLUETOOTH_AUDIO_HAL_PROP_DISABLED \
|
|
"persist.bluetooth.bluetooth_audio_hal.disabled"
|
|
@@ -160,6 +161,12 @@ class BluetoothAudioClientInterface {
|
|
// "android.hardware.bluetooth.audio.IBluetoothAudioProviderFactory/default";
|
|
static inline const std::string kDefaultAudioProviderFactoryInterface =
|
|
std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";
|
|
+ static inline const std::string kSystemAudioProviderFactoryInterface =
|
|
+ std::string() + IBluetoothAudioProviderFactory::descriptor + "/sysbta";
|
|
+ static inline const std::string audioProviderFactoryInterface() {
|
|
+ return osi_property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)
|
|
+ ? kSystemAudioProviderFactoryInterface : kDefaultAudioProviderFactoryInterface;
|
|
+ }
|
|
|
|
private:
|
|
IBluetoothTransportInstance* transport_;
|
|
diff --git a/system/audio_hal_interface/hal_version_manager.cc b/system/audio_hal_interface/hal_version_manager.cc
|
|
index 275bbb067e..032856ef0e 100644
|
|
--- a/system/audio_hal_interface/hal_version_manager.cc
|
|
+++ b/system/audio_hal_interface/hal_version_manager.cc
|
|
@@ -25,6 +25,7 @@
|
|
|
|
#include "aidl/audio_aidl_interfaces.h"
|
|
#include "osi/include/log.h"
|
|
+#include "osi/include/properties.h"
|
|
|
|
namespace bluetooth {
|
|
namespace audio {
|
|
@@ -34,6 +35,12 @@ using ::aidl::android::hardware::bluetooth::audio::
|
|
|
|
static const std::string kDefaultAudioProviderFactoryInterface =
|
|
std::string() + IBluetoothAudioProviderFactory::descriptor + "/default";
|
|
+static const std::string kSystemAudioProviderFactoryInterface =
|
|
+ std::string() + IBluetoothAudioProviderFactory::descriptor + "/sysbta";
|
|
+static inline const std::string audioProviderFactoryInterface() {
|
|
+ return osi_property_get_bool("persist.bluetooth.system_audio_hal.enabled", false)
|
|
+ ? kSystemAudioProviderFactoryInterface : kDefaultAudioProviderFactoryInterface;
|
|
+}
|
|
|
|
std::unique_ptr<HalVersionManager> HalVersionManager::instance_ptr =
|
|
std::make_unique<HalVersionManager>();
|
|
@@ -88,7 +95,7 @@ BluetoothAudioHalVersion GetAidlInterfaceVersion() {
|
|
|
|
auto provider_factory = IBluetoothAudioProviderFactory::fromBinder(
|
|
::ndk::SpAIBinder(AServiceManager_waitForService(
|
|
- kDefaultAudioProviderFactoryInterface.c_str())));
|
|
+ audioProviderFactoryInterface().c_str())));
|
|
|
|
if (provider_factory == nullptr) {
|
|
LOG_ERROR("Can't get aidl version from unknown factory");
|
|
@@ -122,7 +129,7 @@ BluetoothAudioHalVersion GetAidlInterfaceVersion() {
|
|
HalVersionManager::HalVersionManager() {
|
|
hal_transport_ = BluetoothAudioHalTransport::UNKNOWN;
|
|
if (AServiceManager_checkService(
|
|
- kDefaultAudioProviderFactoryInterface.c_str()) != nullptr) {
|
|
+ audioProviderFactoryInterface().c_str()) != nullptr) {
|
|
hal_version_ = GetAidlInterfaceVersion();
|
|
hal_transport_ = BluetoothAudioHalTransport::AIDL;
|
|
return;
|
|
--
|
|
2.43.1
|
|
|