GATT close status is unused

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie7f107e8df91de835948c21b6f6a6ace406a8ff2

diff --git a/bta/gatt/bta_gattc_act.cc b/bta/gatt/bta_gattc_act.cc
index 196620a..05cfd18 100644 (file)
--- a/bta/gatt/bta_gattc_act.cc
+++ b/bta/gatt/bta_gattc_act.cc
@@ -512,7 +512,6 @@ void bta_gattc_close_fail(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
     cb_data.close.client_if = p_clcb->p_rcb->client_if;
     cb_data.close.conn_id = p_data->hdr.layer_specific;
     cb_data.close.remote_bda = p_clcb->bda;
-    cb_data.close.status = GATT_ERROR;
     cb_data.close.reason = BTA_GATT_CONN_NONE;
 
     LOG(WARNING) << __func__ << ": conn_id=" << loghex(cb_data.close.conn_id)
@@ -533,7 +532,6 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
   cb_data.close.client_if = p_clcb->p_rcb->client_if;
   cb_data.close.conn_id = p_clcb->bta_conn_id;
   cb_data.close.reason = p_clcb->reason;
-  cb_data.close.status = p_clcb->status;
   cb_data.close.remote_bda = p_clcb->bda;
 
   if (p_clcb->transport == BT_TRANSPORT_BR_EDR)
@@ -542,9 +540,8 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
   bta_gattc_clcb_dealloc(p_clcb);
 
   if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) {
-    cb_data.close.status = GATT_Disconnect(p_data->hdr.layer_specific);
+    GATT_Disconnect(p_data->hdr.layer_specific);
   } else if (p_data->hdr.event == BTA_GATTC_INT_DISCONN_EVT) {
-    cb_data.close.status = static_cast<tGATT_STATUS>(p_data->int_conn.reason);
     cb_data.close.reason = p_data->int_conn.reason;
   }
 

diff --git a/bta/include/bta_gatt_api.h b/bta/include/bta_gatt_api.h
index fddea66..25909b5 100644 (file)
--- a/bta/include/bta_gatt_api.h
+++ b/bta/include/bta_gatt_api.h
@@ -190,7 +190,6 @@ typedef struct {
 } tBTA_GATTC_OPEN;
 
 typedef struct {
-  tGATT_STATUS status;
   uint16_t conn_id;
   tGATT_IF client_if;
   RawAddress remote_bda;