From c58755a354c4f05fbd88e86012aecda06efaa57e Mon Sep 17 00:00:00 2001 From: Lukasz Rymanowski Date: Fri, 7 Mar 2014 11:28:29 +0100 Subject: [PATCH] android: Fix type of discovery on start/stop discovery Discovering type was confused with adapter settings. With this patch it is fixed --- android/bluetooth.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/android/bluetooth.c b/android/bluetooth.c index 1101b643d..6d08a50fa 100644 --- a/android/bluetooth.c +++ b/android/bluetooth.c @@ -2408,14 +2408,13 @@ static void get_adapter_properties(void) static bool start_discovery(void) { struct mgmt_cp_start_discovery cp; - uint8_t type = 1 << BDADDR_BREDR; - if (adapter.current_settings & type) - cp.type = type; + if (adapter.current_settings & MGMT_SETTING_BREDR) + cp.type = 1 << BDADDR_BREDR; else cp.type = 0; - DBG("type=0x%x", type); + DBG("type=0x%x", cp.type); if (mgmt_send(mgmt_if, MGMT_OP_START_DISCOVERY, adapter.index, sizeof(cp), &cp, NULL, NULL, NULL) > 0) @@ -2428,14 +2427,13 @@ static bool start_discovery(void) static bool stop_discovery(void) { struct mgmt_cp_stop_discovery cp; - uint8_t type = 1 << BDADDR_BREDR; - if (adapter.current_settings & type) - cp.type = type; + if (adapter.current_settings & MGMT_SETTING_BREDR) + cp.type = 1 << BDADDR_BREDR; else cp.type = 0; - DBG("type=0x%x", type); + DBG("type=0x%x", cp.type); if (mgmt_send(mgmt_if, MGMT_OP_STOP_DISCOVERY, adapter.index, sizeof(cp), &cp, NULL, NULL, NULL) > 0) -- 2.47.3