Fixup sysbta for Android 14

This commit is contained in:
Peter Cai 2023-10-07 23:19:37 -04:00
parent c4daf7d004
commit ccca70ec25

View file

@ -1,4 +1,4 @@
From 9524502060facedcba0682c61b4b94340d082f36 Mon Sep 17 00:00:00 2001
From a105602829eba6d179d3bfd4f117f2169f724b91 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/2] audio_hal_interface: Optionally use sysbta HAL
@ -7,13 +7,13 @@ Required to support sysbta, our system-side bt audio implementation.
Change-Id: I59973e6ec84c5923be8a7c67b36b2e237f000860
---
system/audio_hal_interface/aidl/client_interface_aidl.cc | 6 +++---
system/audio_hal_interface/aidl/client_interface_aidl.cc | 8 ++++----
system/audio_hal_interface/aidl/client_interface_aidl.h | 7 +++++++
system/audio_hal_interface/hal_version_manager.cc | 9 ++++++++-
3 files changed, 18 insertions(+), 4 deletions(-)
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 897b891aa7..660a141894 100644
index 897b891aa7..ed41627c3e 100644
--- a/system/audio_hal_interface/aidl/client_interface_aidl.cc
+++ b/system/audio_hal_interface/aidl/client_interface_aidl.cc
@@ -56,7 +56,7 @@ BluetoothAudioClientInterface::BluetoothAudioClientInterface(
@ -43,6 +43,15 @@ index 897b891aa7..660a141894 100644
if (provider_factory == nullptr) {
LOG(ERROR) << __func__ << ", can't get capability from unknown factory";
@@ -266,7 +266,7 @@ int BluetoothAudioClientInterface::GetAidlInterfaceVersion() {
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 aidl version 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 8a40c1d7d7..6d962d3473 100644
--- a/system/audio_hal_interface/aidl/client_interface_aidl.h