From b4dac305700daebcad47a14e555b73affdfb15ef Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Fri, 3 Jan 2014 21:26:33 +0100 Subject: [PATCH] android/bluetooth: Use HAL_STATUS_SUCCESS instead of _DONE in replies JNI code in Android is mapping returned code to boolean value. Only SUCCESS status is mapped to true and that value is returned to Java code. This could result in faultyly triggering error path in Java when returning DONE in command reply. --- android/bluetooth.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/android/bluetooth.c b/android/bluetooth.c index 15bddc288..e3f68a750 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -720,7 +720,7 @@ static uint8_t browse_remote_sdp(const bdaddr_t *addr) uuid_t uuid; if (g_slist_find_custom(browse_reqs, addr, req_cmp)) - return HAL_STATUS_DONE; + return HAL_STATUS_SUCCESS; req = g_new0(struct browse_req, 1); bacpy(&req->bdaddr, addr); @@ -2298,7 +2298,7 @@ done: /* Android expects property changed callback */ scan_mode_changed(); - return HAL_STATUS_DONE; + return HAL_STATUS_SUCCESS; } static void handle_set_adapter_prop_cmd(const void *buf, uint16_t len) @@ -2692,7 +2692,7 @@ static void handle_enable_cmd(const void *buf, uint16_t len) send_bonded_devices_props(); if (adapter.current_settings & MGMT_SETTING_POWERED) { - status = HAL_STATUS_DONE; + status = HAL_STATUS_SUCCESS; goto failed; } @@ -2711,7 +2711,7 @@ static void handle_disable_cmd(const void *buf, uint16_t len) uint8_t status; if (!(adapter.current_settings & MGMT_SETTING_POWERED)) { - status = HAL_STATUS_DONE; + status = HAL_STATUS_SUCCESS; goto failed; } @@ -2897,7 +2897,7 @@ static void handle_start_discovery_cmd(const void *buf, uint16_t len) uint8_t status; if (adapter.discovering) { - status = HAL_STATUS_DONE; + status = HAL_STATUS_SUCCESS; goto failed; } @@ -2921,7 +2921,7 @@ static void handle_cancel_discovery_cmd(const void *buf, uint16_t len) uint8_t status; if (!adapter.discovering) { - status = HAL_STATUS_DONE; + status = HAL_STATUS_SUCCESS; goto failed; } -- 2.47.3