Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Regsiter BT HAL services if they are declared" into main am: 9dec1ab884 am: 57adb5a541

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2927170

Change-Id: Ibbd0858f24837f886c16e184c8ac187043c612ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jooyung Han
2024-01-26 08:12:10 +00:00
committed by Automerger Merge Worker
parent eca8be369d 57adb5a541
commit 2f41f8948c
3 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bluetooth/finder/aidl/default/service.cpp
View File

@@ -35,12 +35,16 @@ int main(int /* argc */, char** /* argv */) {
ndk::SharedRefBase::make<BluetoothFinder>();
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;
}

11
bluetooth/lmp_event/aidl/default/src/main.rs
View File

@@ -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()
}

14
bluetooth/ranging/aidl/default/service.cpp
View File

@@ -37,12 +37,16 @@ int main(int /* argc */, char** /* argv */) {
ndk::SharedRefBase::make<BluetoothChannelSounding>();
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;
}