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

Commit 1268c1b6 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge "gattc: Remove definitions for unused event BTA_GATTC_ACL_EVT" into main

parents a810e19f e46c06eb

system/bta/dm/bta_dm_disc.cc

+0 −1
Original line number Diff line number Diff line
@@ -706,7 +706,6 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
      }

      break;



    case BTA_GATTC_ACL_EVT:

    case BTA_GATTC_CANCEL_OPEN_EVT:

    case BTA_GATTC_CFG_MTU_EVT:

    case BTA_GATTC_CONGEST_EVT:

system/bta/dm/bta_dm_disc_legacy.cc

+0 −1
Original line number Diff line number Diff line
@@ -1994,7 +1994,6 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
      }

      break;



    case BTA_GATTC_ACL_EVT:

    case BTA_GATTC_CANCEL_OPEN_EVT:

    case BTA_GATTC_CFG_MTU_EVT:

    case BTA_GATTC_CONGEST_EVT:

system/bta/include/bta_gatt_api.h

+0 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ typedef enum : uint8_t { 
  BTA_GATTC_SRVC_DISC_DONE_EVT = 8, /* GATT service discovery done event */

  BTA_GATTC_NOTIF_EVT = 10,         /* GATT attribute notification event */

  BTA_GATTC_EXEC_EVT = 12,          /* execute write complete event */

  BTA_GATTC_ACL_EVT = 13,           /* ACL up event */

  BTA_GATTC_CANCEL_OPEN_EVT = 14,   /* cancel open event */

  BTA_GATTC_SRVC_CHG_EVT = 15,      /* service change event */

  BTA_GATTC_ENC_CMPL_CB_EVT = 17,   /* encryption complete callback event */
@@ -87,7 +86,6 @@ inline std::string gatt_client_event_text(const tBTA_GATTC_EVT& event) { 
    CASE_RETURN_TEXT(BTA_GATTC_SRVC_DISC_DONE_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_NOTIF_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_EXEC_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_ACL_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_CANCEL_OPEN_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_SRVC_CHG_EVT);

    CASE_RETURN_TEXT(BTA_GATTC_ENC_CMPL_CB_EVT);

system/btif/src/btif_gatt_client.cc

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static void btif_gattc_upstreams_evt(uint16_t event, char* p_param) { 
      break;

    }



    case BTA_GATTC_ACL_EVT:

    case BTA_GATTC_DEREG_EVT:

    case BTA_GATTC_SEARCH_RES_EVT:

    case BTA_GATTC_CANCEL_OPEN_EVT: