From 408949f0f716dce43e1c42b949b2abdbcbd4ca61 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 25 Jan 2024 09:18:23 +0900 Subject: [PATCH] Regsiter BT HAL services if they are declared Since finder/ranging/lmp_event HAL services are new and their interfaces are not frozen yet, they can't register services in -next- configuration. Bug: 322204309 Bug: 319155748 Test: run CF in -next- build Change-Id: I4729d8763842c719682ce0124bbaaed86164a7d5 --- bluetooth/finder/aidl/default/service.cpp | 14 +++++++++----- bluetooth/lmp_event/aidl/default/src/main.rs | 11 ++++++----- bluetooth/ranging/aidl/default/service.cpp | 14 +++++++++----- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/bluetooth/finder/aidl/default/service.cpp b/bluetooth/finder/aidl/default/service.cpp index a117df850d..fe8904bde5 100644 --- a/bluetooth/finder/aidl/default/service.cpp +++ b/bluetooth/finder/aidl/default/service.cpp @@ -35,12 +35,16 @@ int main(int /* argc */, char** /* argv */) { ndk::SharedRefBase::make(); std::string instance = std::string() + BluetoothFinder::descriptor + "/default"; - auto result = - AServiceManager_addService(service->asBinder().get(), instance.c_str()); - if (result == STATUS_OK) { - ABinderProcess_joinThreadPool(); + if (AServiceManager_isDeclared(instance.c_str())) { + auto result = + AServiceManager_addService(service->asBinder().get(), instance.c_str()); + if (result != STATUS_OK) { + ALOGE("Could not register as a service!"); + } } else { - ALOGE("Could not register as a service!"); + ALOGE("Could not register as a service because it's not declared."); } + // Keep running + ABinderProcess_joinThreadPool(); return 0; } diff --git a/bluetooth/lmp_event/aidl/default/src/main.rs b/bluetooth/lmp_event/aidl/default/src/main.rs index cbdd4d1521..dfb097f2ae 100644 --- a/bluetooth/lmp_event/aidl/default/src/main.rs +++ b/bluetooth/lmp_event/aidl/default/src/main.rs @@ -41,10 +41,11 @@ fn main() { let lmp_event_service = lmp_event::LmpEvent::new(); let lmp_event_service_binder = BnBluetoothLmpEvent::new_binder(lmp_event_service, BinderFeatures::default()); - binder::add_service( - &format!("{}/default", lmp_event::LmpEvent::get_descriptor()), - lmp_event_service_binder.as_binder(), - ).expect("Failed to register service"); - + let descriptor = format!("{}/default", lmp_event::LmpEvent::get_descriptor()); + if binder::is_declared(&descriptor).expect("Failed to check if declared") { + binder::add_service(&descriptor, lmp_event_service_binder.as_binder()).expect("Failed to register service"); + } else { + info!("{LOG_TAG}: Failed to register service. Not declared."); + } binder::ProcessState::join_thread_pool() } diff --git a/bluetooth/ranging/aidl/default/service.cpp b/bluetooth/ranging/aidl/default/service.cpp index 83e539ec4f..35a3f559aa 100644 --- a/bluetooth/ranging/aidl/default/service.cpp +++ b/bluetooth/ranging/aidl/default/service.cpp @@ -37,12 +37,16 @@ int main(int /* argc */, char** /* argv */) { ndk::SharedRefBase::make(); std::string instance = std::string() + BluetoothChannelSounding::descriptor + "/default"; - auto result = - AServiceManager_addService(service->asBinder().get(), instance.c_str()); - if (result == STATUS_OK) { - ABinderProcess_joinThreadPool(); + if (AServiceManager_isDeclared(instance.c_str())) { + auto result = + AServiceManager_addService(service->asBinder().get(), instance.c_str()); + if (result != STATUS_OK) { + ALOGE("Could not register as a service!"); + } } else { - ALOGE("Could not register as a service!"); + ALOGE("Could not register as a service because it's not declared."); } + // Keep running + ABinderProcess_joinThreadPool(); return 0; }