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

Commit 0694f7f2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "system::stack: Comment out unused parameters" into main am: dbcd26d9 am: 502fddd4 

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



Change-Id: I3d9456093bd2fd81768580f4854a46b2810bcad6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aab062b0 502fddd4

system/stack/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ cc_library_static { 
        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    cflags: [

        "-Wno-unused-parameter",

        /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/

        "-fvisibility=default",

    ],

system/stack/btm/btm_ble_gap.cc

+1 −2
Original line number Diff line number Diff line
@@ -45,14 +45,12 @@ 
#include "osi/include/allocator.h"

#include "osi/include/properties.h"

#include "osi/include/stack_power_telemetry.h"

#include "stack/acl/acl.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_ble_int_types.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec.h"

#include "stack/btm/btm_sec_cb.h"

#include "stack/gatt/gatt_int.h"

#include "stack/include/acl_api.h"

#include "stack/include/advertise_data_parser.h"

#include "stack/include/ble_scanner.h"
@@ -64,6 +62,7 @@ 
#include "stack/include/btm_ble_privacy.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/gap_api.h"

#include "stack/include/gattdefs.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/inq_hci_link_interface.h"

#include "types/ble_address_with_type.h"

system/stack/eatt/eatt_impl.h

+4 −3
Original line number Diff line number Diff line
@@ -132,8 +132,9 @@ struct eatt_impl { 
  }



  bool eatt_l2cap_connect_ind_common(const RawAddress& bda,

                                     std::vector<uint16_t>& lcids, uint16_t psm,

                                     uint16_t peer_mtu, uint8_t identifier) {

                                     std::vector<uint16_t>& lcids,

                                     uint16_t /* psm */, uint16_t peer_mtu,

                                     uint8_t identifier) {

    /* The assumption is that L2CAP layer already check parameters etc.

     * Get our capabilities and accept all the channels.

     */
@@ -504,7 +505,7 @@ struct eatt_impl { 
    }

  }



  void eatt_l2cap_disconnect_ind(uint16_t lcid, bool please_confirm) {

  void eatt_l2cap_disconnect_ind(uint16_t lcid, bool /* please_confirm */) {

    log::info("cid: 0x{:x}", lcid);

    eatt_device* eatt_dev = find_device_by_cid(lcid);

    if (!eatt_dev) {

system/stack/gap/gap_ble.cc

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ void cl_op_cmpl(tGAP_CLCB& clcb, bool status, uint16_t len, uint8_t* p_name) { 


/** Client connection callback */

void client_connect_cback(tGATT_IF, const RawAddress& bda, uint16_t conn_id,

                          bool connected, tGATT_DISCONN_REASON reason,

                          bool connected, tGATT_DISCONN_REASON /* reason */,

                          tBT_TRANSPORT) {

  tGAP_CLCB* p_clcb = find_clcb_by_bd_addr(bda);

  if (p_clcb == NULL) {

system/stack/gap/gap_conn.cc

+4 −4
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void gap_conn_init(void) { 
 *                            GAP_INVALID_HANDLE

 *

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

uint16_t GAP_ConnOpen(const char* p_serv_name, uint8_t service_id,

uint16_t GAP_ConnOpen(const char* /* p_serv_name */, uint8_t service_id,

                      bool is_server, const RawAddress* p_rem_bda, uint16_t psm,

                      uint16_t le_mps, tL2CAP_CFG_INFO* p_cfg,

                      tL2CAP_ERTM_INFO* ertm_info, uint16_t security,
@@ -588,7 +588,7 @@ void gap_tx_complete_ind(uint16_t l2cap_cid, uint16_t sdu_sent) { 
 *

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

static void gap_connect_ind(const RawAddress& bd_addr, uint16_t l2cap_cid,

                            uint16_t psm, uint8_t l2cap_id) {

                            uint16_t psm, uint8_t /* l2cap_id */) {

  uint16_t xx;

  tGAP_CCB* p_ccb;
@@ -798,7 +798,7 @@ static void gap_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) { 
 * Returns          void

 *

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

static void gap_config_cfm(uint16_t l2cap_cid, uint16_t initiator,

static void gap_config_cfm(uint16_t l2cap_cid, uint16_t /* initiator */,

                           tL2CAP_CFG_INFO* p_cfg) {

  gap_config_ind(l2cap_cid, p_cfg);
@@ -823,7 +823,7 @@ static void gap_config_cfm(uint16_t l2cap_cid, uint16_t initiator, 
 * Returns          void

 *

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

static void gap_disconnect_ind(uint16_t l2cap_cid, bool ack_needed) {

static void gap_disconnect_ind(uint16_t l2cap_cid, bool /* ack_needed */) {

  tGAP_CCB* p_ccb;



  /* Find CCB based on CID */