Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62c3e060 authored by Hyundo Moon's avatar Hyundo Moon Committed by Automerger Merge Worker
Browse files

Merge "Fix typo BTA_GATTS_DELELTE_EVT" into main am: c1ae6588 am: c1995345 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3133094



Change-Id: I180007d76c1355b3109dfe0c845f0d3be91e2fb9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 946fad1a c1995345

system/bta/gatt/bta_gatts_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ void bta_gatts_delete_service(tBTA_GATTS_SRVC_CB* p_srvc_cb, 
    cb_data.srvc_oper.status = GATT_ERROR;

  }



  if (p_rcb->p_cback) (*p_rcb->p_cback)(BTA_GATTS_DELELTE_EVT, &cb_data);

  if (p_rcb->p_cback) (*p_rcb->p_cback)(BTA_GATTS_DELETE_EVT, &cb_data);

}



/*******************************************************************************

system/bta/include/bta_gatt_api.h

+2 −2
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ typedef void(tBTA_GATTC_CBACK)(tBTA_GATTC_EVT event, tBTA_GATTC* p_data); 
#define BTA_GATTS_MTU_EVT GATTS_REQ_TYPE_MTU                           /* 6 */

#define BTA_GATTS_CONF_EVT GATTS_REQ_TYPE_CONF                         /* 7 */

#define BTA_GATTS_DEREG_EVT 8

#define BTA_GATTS_DELELTE_EVT 11

#define BTA_GATTS_DELETE_EVT 11

#define BTA_GATTS_STOP_EVT 13

#define BTA_GATTS_CONNECT_EVT 14

#define BTA_GATTS_DISCONNECT_EVT 15
@@ -308,7 +308,7 @@ inline std::string gatt_server_event_text(const tBTA_GATTS_EVT& event) { 
    CASE_RETURN_TEXT(BTA_GATTS_MTU_EVT);

    CASE_RETURN_TEXT(BTA_GATTS_CONF_EVT);

    CASE_RETURN_TEXT(BTA_GATTS_DEREG_EVT);

    CASE_RETURN_TEXT(BTA_GATTS_DELELTE_EVT);

    CASE_RETURN_TEXT(BTA_GATTS_DELETE_EVT);

    CASE_RETURN_TEXT(BTA_GATTS_STOP_EVT);

    CASE_RETURN_TEXT(BTA_GATTS_CONNECT_EVT);

    CASE_RETURN_TEXT(BTA_GATTS_DISCONNECT_EVT);

system/btif/src/btif_gatt_server.cc

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void btapp_gatts_handle_cback(uint16_t event, char* p_param) { 
                p_data->srvc_oper.service_id);

      break;



    case BTA_GATTS_DELELTE_EVT:

    case BTA_GATTS_DELETE_EVT:

      HAL_CBACK(bt_gatt_callbacks, server->service_deleted_cb,

                p_data->srvc_oper.status, p_data->srvc_oper.server_if,

                p_data->srvc_oper.service_id);