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

Commit 95dcd43c authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes If8900a51,If40febec into main am: aa6a13d7 am: 31776090 

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



Change-Id: I747ed5dabc1019e63a045ebe30cfb76dca8ccc0a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7f70557 31776090

system/btif/src/btif_gatt_client.cc

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



    case BTA_GATTC_CLOSE_EVT: {

      log::debug("BTA_GATTC_CLOSE_EVT {}", p_data->close.remote_bda);

      HAL_CBACK(bt_gatt_callbacks, client->close_cb, p_data->close.conn_id,

                p_data->close.status, p_data->close.client_if,

                p_data->close.remote_bda);

system/stack/test/common/mock_l2cap_layer.cc

+0 −5
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ uint16_t L2CA_ConnectReq(uint16_t psm, const RawAddress& bd_addr) { 
  return l2cap_interface->ConnectRequest(psm, bd_addr);

}



bool L2CA_ConnectRsp(const RawAddress& bd_addr, uint8_t id, uint16_t lcid,

                     uint16_t result, uint16_t status) {

  return l2cap_interface->ConnectResponse(bd_addr, id, lcid, result, status);

}



bool L2CA_DisconnectReq(uint16_t cid) {

  return l2cap_interface->DisconnectRequest(cid);

}