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

Commit e3403795 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge changes Ic995bf66,If900fb42,I9aa02504 into main am: cea871fd 

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



Change-Id: I4c1513a52f8851a86192ced9bb5a427cc73a7329
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29cbf1c5 cea871fd

system/bta/csis/csis_client.cc

+1 −1
Original line number Diff line number Diff line
@@ -1857,7 +1857,7 @@ private: 
        break;



      case BTA_GATTC_SRVC_DISC_DONE_EVT:

        OnGattServiceDiscoveryDoneEvent(p_data->remote_bda);

        OnGattServiceDiscoveryDoneEvent(p_data->service_discovery_done.remote_bda);

        break;



      default:

system/bta/gatt/bta_gattc_act.cc

+7 −5
Original line number Diff line number Diff line
@@ -944,8 +944,9 @@ void bta_gattc_disc_cmpl(tBTA_GATTC_CLCB* p_clcb, const tBTA_GATTC_DATA* /* p_da 
  }



  if (p_clcb->p_rcb->p_cback) {

    tBTA_GATTC bta_gattc;

    bta_gattc.remote_bda = p_clcb->p_srcb->server_bda;

    tBTA_GATTC bta_gattc = {

            .service_discovery_done.remote_bda = p_clcb->p_srcb->server_bda,

    };

    (*p_clcb->p_rcb->p_cback)(BTA_GATTC_SRVC_DISC_DONE_EVT, &bta_gattc);

  }

}
@@ -1477,9 +1478,10 @@ static bool bta_gattc_process_srvc_chg_ind(uint16_t conn_id, tBTA_GATTC_RCB* p_c 


  /* notify applicationf or service change */

  if (p_clrcb->p_cback) {

    tBTA_GATTC bta_gattc;

    bta_gattc.service_changed.remote_bda = p_srcb->server_bda;

    bta_gattc.service_changed.conn_id = conn_id;

    tBTA_GATTC bta_gattc = {.service_changed = {

                                    .remote_bda = p_srcb->server_bda,

                                    .conn_id = conn_id,

                            }};

    (*p_clrcb->p_cback)(BTA_GATTC_SRVC_CHG_EVT, &bta_gattc);

  }

system/bta/has/has_client.cc

+2 −2
Original line number Diff line number Diff line
@@ -1811,11 +1811,11 @@ private: 
        break;



      case BTA_GATTC_SRVC_CHG_EVT:

        OnGattServiceChangeEvent(p_data->remote_bda);

        OnGattServiceChangeEvent(p_data->service_changed.remote_bda);

        break;



      case BTA_GATTC_SRVC_DISC_DONE_EVT:

        OnGattServiceDiscoveryDoneEvent(p_data->remote_bda);

        OnGattServiceDiscoveryDoneEvent(p_data->service_discovery_done.remote_bda);

        break;



      default:

system/bta/hearing_aid/hearing_aid.cc

+2 −2
Original line number Diff line number Diff line
@@ -2057,14 +2057,14 @@ static void hearingaid_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) 
      if (!instance) {

        return;

      }

      instance->OnServiceChangeEvent(p_data->remote_bda);

      instance->OnServiceChangeEvent(p_data->service_changed.remote_bda);

      break;



    case BTA_GATTC_SRVC_DISC_DONE_EVT:

      if (!instance) {

        return;

      }

      instance->OnServiceDiscDoneEvent(p_data->service_changed.remote_bda);

      instance->OnServiceDiscDoneEvent(p_data->service_discovery_done.remote_bda);

      break;

    case BTA_GATTC_PHY_UPDATE_EVT: {

      if (!instance) {

system/bta/hh/bta_hh_le.cc

+16 −20
Original line number Diff line number Diff line
@@ -890,10 +890,10 @@ static void bta_hh_le_get_protocol_mode(tBTA_HH_DEV_CB* p_cb) { 
 *

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

static void bta_hh_le_dis_cback(const RawAddress& addr, tDIS_VALUE* p_dis_value) {

  tAclLinkSpec link_spec;

  link_spec.addrt.bda = addr;

  link_spec.addrt.type = BLE_ADDR_PUBLIC;

  link_spec.transport = BT_TRANSPORT_LE;

  tAclLinkSpec link_spec = {

          .addrt = {.type = BLE_ADDR_PUBLIC, .bda = addr},

          .transport = BT_TRANSPORT_LE,

  };

  tBTA_HH_DEV_CB* p_cb = bta_hh_le_find_dev_cb_by_bda(link_spec);



  if (p_cb == nullptr) {
@@ -963,10 +963,10 @@ static void bta_hh_le_pri_service_discovery(tBTA_HH_DEV_CB* p_cb) { 
 ******************************************************************************/

static void bta_hh_le_encrypt_cback(RawAddress bd_addr, tBT_TRANSPORT transport,

                                    void* /* p_ref_data */, tBTM_STATUS result) {

  tAclLinkSpec link_spec;

  link_spec.addrt.bda = bd_addr;

  link_spec.addrt.type = BLE_ADDR_PUBLIC;

  link_spec.transport = transport;

  tAclLinkSpec link_spec = {

          .addrt = {.type = BLE_ADDR_PUBLIC, .bda = bd_addr},

          .transport = transport,

  };



  tBTA_HH_DEV_CB* p_dev_cb = bta_hh_get_cb(link_spec);

  if (p_dev_cb == nullptr) {
@@ -1169,10 +1169,10 @@ void bta_hh_gatt_open(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_buf) { 
 *

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

static void bta_hh_le_close(const tBTA_GATTC_CLOSE& gattc_data) {

  tAclLinkSpec link_spec;

  link_spec.addrt.bda = gattc_data.remote_bda;

  link_spec.addrt.type = BLE_ADDR_PUBLIC;

  link_spec.transport = BT_TRANSPORT_LE;

  tAclLinkSpec link_spec = {

          .addrt = {.type = BLE_ADDR_PUBLIC, .bda = gattc_data.remote_bda},

          .transport = BT_TRANSPORT_LE,

  };



  tBTA_HH_DEV_CB* p_cb = bta_hh_le_find_dev_cb_by_bda(link_spec);

  if (p_cb == nullptr) {
@@ -2181,9 +2181,7 @@ static void bta_hh_le_service_discovery_done(tAclLinkSpec link_spec) { 
 ******************************************************************************/

static void bta_hh_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) {

  tBTA_HH_DEV_CB* p_dev_cb;

  tAclLinkSpec link_spec;

  link_spec.addrt.type = BLE_ADDR_PUBLIC;

  link_spec.transport = BT_TRANSPORT_LE;

  tAclLinkSpec link_spec = {.addrt.type = BLE_ADDR_PUBLIC, .transport = BT_TRANSPORT_LE};



  log::verbose("event:{}", gatt_client_event_text(event));

  if (p_data == NULL) {
@@ -2217,12 +2215,12 @@ static void bta_hh_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC* p_data) { 
      break;



    case BTA_GATTC_SRVC_CHG_EVT:

      link_spec.addrt.bda = p_data->remote_bda;

      link_spec.addrt.bda = p_data->service_changed.remote_bda;

      bta_hh_le_service_changed(link_spec);

      break;



    case BTA_GATTC_SRVC_DISC_DONE_EVT:

      link_spec.addrt.bda = p_data->remote_bda;

      link_spec.addrt.bda = p_data->service_discovery_done.remote_bda;

      bta_hh_le_service_discovery_done(link_spec);

      break;
@@ -2288,9 +2286,7 @@ static bool bta_hh_le_iso_data_callback(const RawAddress& addr, uint16_t cis_con 
    return false;

  }



  tAclLinkSpec link_spec{};

  link_spec.addrt.bda = addr;

  link_spec.transport = BT_TRANSPORT_LE;

  tAclLinkSpec link_spec = {.addrt.bda = addr, .transport = BT_TRANSPORT_LE};



  tBTA_HH_DEV_CB* p_dev_cb = bta_hh_le_find_dev_cb_by_bda(link_spec);

  if (p_dev_cb == nullptr) {