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

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

Merge "Fix some tidy error" am: 20577fbe 

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



Change-Id: Ia231b60c1599523d6cb18aa27cdb3e146a467d28
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ee9c891c 20577fbe

system/stack/btm/btm_int_types.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class TimestampedStringCircularBuffer 
  explicit TimestampedStringCircularBuffer(size_t size)

      : bluetooth::common::TimestampedCircularBuffer<std::string>(size) {}



  void Push(std::string s) {

  void Push(const std::string& s) {

    bluetooth::common::TimestampedCircularBuffer<std::string>::Push(

        s.substr(0, kMaxLogSize));

  }

system/stack/gatt/gatt_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -1088,7 +1088,7 @@ void GATT_SetIdleTimeout(const RawAddress& bd_addr, uint16_t idle_tout, 
 *                  with GATT

 *

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

tGATT_IF GATT_Register(const Uuid& app_uuid128, std::string name,

tGATT_IF GATT_Register(const Uuid& app_uuid128, const std::string& name,

                       tGATT_CBACK* p_cb_info, bool eatt_support) {

  tGATT_REG* p_reg;

  uint8_t i_gatt_if = 0;

system/stack/gatt/gatt_int.h

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ extern bool gatt_sr_is_cl_multi_variable_len_notif_supported(tGATT_TCB& tcb); 


extern bool gatt_sr_is_cl_change_aware(tGATT_TCB& tcb);

extern void gatt_sr_init_cl_status(tGATT_TCB& tcb);

extern void gatt_sr_update_cl_status(tGATT_TCB& tcb, bool chg_unaware);

extern void gatt_sr_update_cl_status(tGATT_TCB& tcb, bool chg_aware);



/* Functions provided by att_protocol.cc */

extern tGATT_STATUS attp_send_cl_confirmation_msg(tGATT_TCB& tcb, uint16_t cid);

system/stack/include/gatt_api.h

+1 −1
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ extern void GATT_SetIdleTimeout(const RawAddress& bd_addr, uint16_t idle_tout, 
 *

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

extern tGATT_IF GATT_Register(const bluetooth::Uuid& p_app_uuid128,

                              const std::string name, tGATT_CBACK* p_cb_info,

                              const std::string& name, tGATT_CBACK* p_cb_info,

                              bool eatt_support);



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

system/test/mock/mock_stack_gatt_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ bool GATT_GetConnectionInfor(uint16_t conn_id, tGATT_IF* p_gatt_if, 
  return test::mock::stack_gatt_api::GATT_GetConnectionInfor(

      conn_id, p_gatt_if, bd_addr, p_transport);

}

tGATT_IF GATT_Register(const Uuid& app_uuid128, std::string name,

tGATT_IF GATT_Register(const Uuid& app_uuid128, const std::string& name,

                       tGATT_CBACK* p_cb_info, bool eatt_support) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_gatt_api::GATT_Register(app_uuid128, name, p_cb_info,