diff options
Diffstat (limited to 'system/bta/gatt/bta_gattc_act.cc')
| -rw-r--r-- | system/bta/gatt/bta_gattc_act.cc | 53 |
1 files changed, 48 insertions, 5 deletions
diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc index cd9da7a949..783ab69f14 100644 --- a/system/bta/gatt/bta_gattc_act.cc +++ b/system/bta/gatt/bta_gattc_act.cc @@ -385,6 +385,16 @@ void bta_gattc_open(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) { return; } + tBTA_GATTC_RCB* p_clreg = p_clcb->p_rcb; + /* Re-enable notification registration for closed connection */ + for (int i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i++) { + if (p_clreg->notif_reg[i].in_use && + p_clreg->notif_reg[i].remote_bda == p_clcb->bda && + p_clreg->notif_reg[i].app_disconnected) { + p_clreg->notif_reg[i].app_disconnected = false; + } + } + /* a connected remote device */ if (GATT_GetConnIdIfConnected( p_clcb->p_rcb->client_if, p_data->api_conn.remote_bda, @@ -511,6 +521,16 @@ void bta_gattc_conn(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) { if (p_clcb->p_srcb->mtu == 0) p_clcb->p_srcb->mtu = GATT_DEF_BLE_MTU_SIZE; + tBTA_GATTC_RCB* p_clreg = p_clcb->p_rcb; + /* Re-enable notification registration for closed connection */ + for (int i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i++) { + if (p_clreg->notif_reg[i].in_use && + p_clreg->notif_reg[i].remote_bda == p_clcb->bda && + p_clreg->notif_reg[i].app_disconnected) { + p_clreg->notif_reg[i].app_disconnected = false; + } + } + /* start database cache if needed */ if (p_clcb->p_srcb->gatt_database.IsEmpty() || p_clcb->p_srcb->state != BTA_GATTC_SERV_IDLE) { @@ -604,6 +624,14 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* p_data) { bta_sys_conn_close(BTA_ID_GATTC, BTA_ALL_APP_ID, p_clcb->bda); } + /* Disable notification registration for closed connection */ + for (int i = 0; i < BTA_GATTC_NOTIF_REG_MAX; i++) { + if (p_clreg->notif_reg[i].in_use && + p_clreg->notif_reg[i].remote_bda == p_clcb->bda) { + p_clreg->notif_reg[i].app_disconnected = true; + } + } + bta_gattc_clcb_dealloc(p_clcb); if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) { @@ -963,13 +991,28 @@ static void bta_gattc_write_cmpl(tBTA_GATTC_CLCB* p_clcb, GATT_WRITE_OP_CB cb = p_clcb->p_q_cmd->api_write.write_cb; void* my_cb_data = p_clcb->p_q_cmd->api_write.write_cb_data; - osi_free_and_reset((void**)&p_clcb->p_q_cmd); - if (cb) { - cb(p_clcb->bta_conn_id, p_data->status, p_data->p_cmpl->att_value.handle, - p_data->p_cmpl->att_value.len, p_data->p_cmpl->att_value.value, - my_cb_data); + if (p_data->status == 0 && + p_clcb->p_q_cmd->api_write.write_type == BTA_GATTC_WRITE_PREPARE) { + LOG_DEBUG("Handling prepare write success response: handle 0x%04x", + p_data->p_cmpl->att_value.handle); + /* If this is successful Prepare write, lets provide to the callback the + * data provided by server */ + cb(p_clcb->bta_conn_id, p_data->status, p_data->p_cmpl->att_value.handle, + p_data->p_cmpl->att_value.len, p_data->p_cmpl->att_value.value, + my_cb_data); + } else { + LOG_DEBUG("Handling write response type: %d: handle 0x%04x", + p_clcb->p_q_cmd->api_write.write_type, + p_data->p_cmpl->att_value.handle); + /* Otherwise, provide data which were intended to write. */ + cb(p_clcb->bta_conn_id, p_data->status, p_data->p_cmpl->att_value.handle, + p_clcb->p_q_cmd->api_write.len, p_clcb->p_q_cmd->api_write.p_value, + my_cb_data); + } } + + osi_free_and_reset((void**)&p_clcb->p_q_cmd); } /** execute write complete */ |