diff options
author | James Bootsma <james.bootsma@thisisant.com> | 2018-01-03 16:58:15 -0700 |
---|---|---|
committer | James Bootsma <james.bootsma@thisisant.com> | 2018-01-03 16:58:15 -0700 |
commit | f17bf96415e1b0e40391baf5a2b449ab622fe6bc (patch) | |
tree | ded79e0569410242b8e56c49f9903ee827ea86b5 | |
parent | a890bca14bae0346775f2c56e58c5414c2666113 (diff) | |
download | android_external_ant-wireless_ant_native-f17bf96415e1b0e40391baf5a2b449ab622fe6bc.tar.gz android_external_ant-wireless_ant_native-f17bf96415e1b0e40391baf5a2b449ab622fe6bc.tar.bz2 android_external_ant-wireless_ant_native-f17bf96415e1b0e40391baf5a2b449ab622fe6bc.zip |
Version 1.9.6
- Qualcomm bug fix for HIDL interface.
-rw-r--r-- | src/common/inc/ant_version.h | 2 | ||||
-rw-r--r-- | src/qcomm-hidl/AntHidlClient.cpp | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/src/common/inc/ant_version.h b/src/common/inc/ant_version.h index e7aea10..4a8881a 100644 --- a/src/common/inc/ant_version.h +++ b/src/common/inc/ant_version.h @@ -21,7 +21,7 @@ #define LIBANT_STACK_MAJOR "1"
#define LIBANT_STACK_MINOR "9"
-#define LIBANT_STACK_INCRE "6"
+#define LIBANT_STACK_INCRE "7"
#endif // __ANT_VERSION_H
diff --git a/src/qcomm-hidl/AntHidlClient.cpp b/src/qcomm-hidl/AntHidlClient.cpp index c118da5..616a5a6 100644 --- a/src/qcomm-hidl/AntHidlClient.cpp +++ b/src/qcomm-hidl/AntHidlClient.cpp @@ -187,7 +187,11 @@ void hci_close() { { std::unique_lock< std::mutex> lock(ant_hci.data_mtx); ant_hci.data_cond.notify_all(); - anthci->close(); + auto hidl_daemon_status = anthci->close(); + if(!hidl_daemon_status.isOk()) + { + ALOGE("%s: HIDL daemon is dead", __func__); + } } ant_hci.state = ANT_RADIO_DISABLED; ant_rx_clear(); @@ -213,12 +217,18 @@ ANTStatus ant_tx_write(ANT_U8 *pucTxMessage,ANT_U8 ucMessageLength) if (packet_type == ANT_DATA_TYPE_PACKET) { auto hidl_daemon_status = anthci->sendAntData(data); + if (!hidl_daemon_status.isOk()) + { + ALOGE("%s:sendAntData failed,HIDL dead", __func__); + return -1; + } } else { auto hidl_daemon_status = anthci->sendAntControl(data); - } - if (!hidl_daemon_status.isOk()) { - ALOGE("%s:send cmd failed,HIDL daemon dead", __func__); - return -1; + if (!hidl_daemon_status.isOk()) + { + ALOGE("%s:sendAntControl failed,HIDL dead", __func__); + return -1; + } } } else { ALOGE("%s: antHci is NULL", __func__); |