From e6ad61d3b40544465216f4f8e63e6b9519feb055 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Mon, 14 Oct 2013 15:56:14 +0300 Subject: [PATCH] android: Start Android Bluetooth daemon Start Android Bluetooth daemon from HAL init(). Make sure that daemon is in "running" state. --- android/hal_bluetooth.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/android/hal_bluetooth.c b/android/hal_bluetooth.c index 517f0b452..9bb9dcf76 100644 --- a/android/hal_bluetooth.c +++ b/android/hal_bluetooth.c @@ -23,11 +23,16 @@ #include #include +#include +#include + #define LOG_TAG "BlueZ" #include #include "hal.h" +#define SERVICE_NAME "bluetoothd" + bt_callbacks_t *bt_hal_cbacks = NULL; static bool interface_ready(void) @@ -35,6 +40,33 @@ static bool interface_ready(void) return bt_hal_cbacks != NULL; } +static bool start_bt_daemon(void) +{ + int tries = 40; /* wait 4 seconds for completion */ + + ALOGD(__func__); + + /* Start Android Bluetooth daemon service */ + property_set("ctl.start", SERVICE_NAME); + + while (tries-- > 0) { + char val[PROPERTY_VALUE_MAX]; + + if (property_get("init.svc." SERVICE_NAME, val, NULL)) { + if (!strcmp(val, "running")) { + ALOGI("Android BlueZ daemon started"); + return true; + } + } else { + return false; + } + + usleep(100000); + } + + return false; +} + static int init(bt_callbacks_t *callbacks) { ALOGD(__func__); @@ -42,10 +74,13 @@ static int init(bt_callbacks_t *callbacks) if (interface_ready()) return BT_STATUS_SUCCESS; - /* store reference to user callbacks */ - bt_hal_cbacks = callbacks; + if (start_bt_daemon()) { + /* TODO: open channel */ - /* TODO: Init here bluezd task */ + bt_hal_cbacks = callbacks; + + return BT_STATUS_SUCCESS; + } return BT_STATUS_UNSUPPORTED; }