diff options
| -rw-r--r-- | system/bta/hearing_aid/hearing_aid.cc | 9 | ||||
| -rw-r--r-- | system/bta/include/bta_hearing_aid_api.h | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc index b8667fef0a..9f8c3b0ff9 100644 --- a/system/bta/hearing_aid/hearing_aid.cc +++ b/system/bta/hearing_aid/hearing_aid.cc @@ -41,7 +41,6 @@ #include "stack/include/acl_api_types.h" // tBTM_RSSI_RESULT #include "stack/include/bt_hdr.h" #include "stack/include/bt_octets.h" -#include "stack/include/gap_api.h" #include "stack/include/l2c_api.h" // L2CAP_MIN_OFFSET #include "types/bluetooth/uuid.h" #include "types/bt_transport.h" @@ -589,9 +588,9 @@ class HearingAidImpl : public HearingAid { hearingDevice->first_connection = true; hearingDevice->service_changed_rcvd = true; BtaGattQueue::Clean(hearingDevice->conn_id); - if (hearingDevice->gap_handle) { + if (hearingDevice->gap_handle != GAP_INVALID_HANDLE) { GAP_ConnClose(hearingDevice->gap_handle); - hearingDevice->gap_handle = 0; + hearingDevice->gap_handle = GAP_INVALID_HANDLE; } } @@ -1549,9 +1548,9 @@ class HearingAidImpl : public HearingAid { hearingDevice->conn_id = 0; } - if (hearingDevice->gap_handle) { + if (hearingDevice->gap_handle != GAP_INVALID_HANDLE) { GAP_ConnClose(hearingDevice->gap_handle); - hearingDevice->gap_handle = 0; + hearingDevice->gap_handle = GAP_INVALID_HANDLE; } hearingDevice->accepting_audio = false; diff --git a/system/bta/include/bta_hearing_aid_api.h b/system/bta/include/bta_hearing_aid_api.h index b7ac365335..3ae46fd751 100644 --- a/system/bta/include/bta_hearing_aid_api.h +++ b/system/bta/include/bta_hearing_aid_api.h @@ -26,6 +26,7 @@ #include <functional> #include <vector> +#include "stack/include/gap_api.h" #include "types/raw_address.h" constexpr uint16_t HEARINGAID_MAX_NUM_UUIDS = 1; @@ -166,7 +167,7 @@ struct HearingDevice { connection_update_status(NONE), accepting_audio(false), conn_id(0), - gap_handle(0), + gap_handle(GAP_INVALID_HANDLE), audio_control_point_handle(audio_control_point_handle), audio_status_handle(audio_status_handle), audio_status_ccc_handle(audio_status_ccc_handle), @@ -190,7 +191,7 @@ struct HearingDevice { connection_update_status(NONE), accepting_audio(false), conn_id(0), - gap_handle(0), + gap_handle(GAP_INVALID_HANDLE), audio_status_handle(0), audio_status_ccc_handle(0), service_changed_ccc_handle(0), |