Return-Path: From: Andrei Emeltchenko To: linux-bluetooth@vger.kernel.org Subject: [PATCHv3] android/hal-health: Clear NONBLOCK flag from fd Date: Thu, 3 Jul 2014 14:17:13 +0300 Message-Id: <1404386233-27863-1-git-send-email-Andrei.Emeltchenko.news@gmail.com> Sender: linux-bluetooth-owner@vger.kernel.org List-ID: From: Andrei Emeltchenko Java expects file descriptor passed with channel_state_cb() to be blocking. --- android/hal-health.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/android/hal-health.c b/android/hal-health.c index 20ba459..1ed9fb1 100644 --- a/android/hal-health.c +++ b/android/hal-health.c @@ -19,6 +19,9 @@ #include #include #include +#include +#include +#include #include "hal-log.h" #include "hal.h" @@ -44,6 +47,19 @@ static void handle_app_registration_state(void *buf, uint16_t len, int fd) static void handle_channel_state(void *buf, uint16_t len, int fd) { struct hal_ev_health_channel_state *ev = buf; + int flags; + + flags = fcntl(fd, F_GETFL, 0); + if (flags < 0) { + error("health: fcntl GETFL error: %s", strerror(errno)); + return; + } + + /* Clean O_NONBLOCK fd flag as Android Java layer expects */ + if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) < 0) { + error("health: fcntl SETFL error: %s", strerror(errno)); + return; + } if (cbacks->channel_state_cb) cbacks->channel_state_cb(ev->app_id, (bt_bdaddr_t *) ev->bdaddr, -- 1.9.1