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

Commit faa70d82 authored by Chris Manton's avatar Chris Manton
Browse files

Comment out unused variables btif:: 

Bug: 323414403
Test: m .
Flag: EXEMPT, Preprocessor change

Change-Id: I38aa2844df77146ceb1052b4ce2ff4b675c70912
parent b18eb399

system/bta/include/bta_hh_api.h

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "macros.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/hiddefs.h"

#include "stack/include/l2c_api.h"

#include "types/raw_address.h"



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

system/btif/src/btif_a2dp_control.cc

+2 −6
Original line number Diff line number Diff line
@@ -26,13 +26,11 @@ 
#include <stdint.h>



#include "audio_a2dp_hw/include/audio_a2dp_hw.h"

#include "btif_a2dp.h"

#include "btif_a2dp_sink.h"

#include "btif_a2dp_source.h"

#include "btif_av.h"

#include "btif_av_co.h"

#include "btif_hf.h"

#include "osi/include/osi.h"

#include "types/raw_address.h"

#include "udrv/include/uipc.h"
@@ -318,8 +316,7 @@ static void btif_a2dp_recv_ctrl_data(void) { 
  }

}



static void btif_a2dp_ctrl_cb(UNUSED_ATTR tUIPC_CH_ID ch_id,

                              tUIPC_EVENT event) {

static void btif_a2dp_ctrl_cb(tUIPC_CH_ID /* ch_id */, tUIPC_EVENT event) {

  // Don't log UIPC_RX_DATA_READY_EVT by default, because it

  // could be very chatty when audio is streaming.

  if (event == UIPC_RX_DATA_READY_EVT) {
@@ -352,8 +349,7 @@ static void btif_a2dp_ctrl_cb(UNUSED_ATTR tUIPC_CH_ID ch_id, 
  }

}



static void btif_a2dp_data_cb(UNUSED_ATTR tUIPC_CH_ID ch_id,

                              tUIPC_EVENT event) {

static void btif_a2dp_data_cb(tUIPC_CH_ID /* ch_id */, tUIPC_EVENT event) {

  LOG_WARN("%s: BTIF MEDIA (A2DP-DATA) EVENT %s", __func__,

           dump_uipc_event(event));

system/btif/src/btif_a2dp_sink.cc

+6 −8
Original line number Diff line number Diff line
@@ -34,12 +34,10 @@ 
#include "btif/include/btif_util.h"  // CASE_RETURN_STR

#include "common/message_loop_thread.h"

#include "include/check.h"

#include "internal_include/bt_target.h"

#include "os/log.h"

#include "osi/include/alarm.h"

#include "osi/include/allocator.h"

#include "osi/include/fixed_queue.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/include/bt_hdr.h"

#include "types/raw_address.h"
@@ -158,7 +156,7 @@ static void btif_a2dp_sink_clear_track_event_req(); 
static void btif_a2dp_sink_on_start_event();

static void btif_a2dp_sink_on_suspend_event();



UNUSED_ATTR static const char* dump_media_event(uint16_t event) {

static const char* dump_media_event(uint16_t event) {

  switch (event) {

    CASE_RETURN_STR(BTIF_MEDIA_SINK_DECODER_UPDATE)

    CASE_RETURN_STR(BTIF_MEDIA_SINK_CLEAR_TRACK)
@@ -425,7 +423,7 @@ void btif_a2dp_sink_on_idle() { 
  btif_a2dp_sink_clear_track_event_req();

}



void btif_a2dp_sink_on_stopped(UNUSED_ATTR tBTA_AV_SUSPEND* p_av_suspend) {

void btif_a2dp_sink_on_stopped(tBTA_AV_SUSPEND* /* p_av_suspend */) {

  LOG_INFO("%s", __func__);

  BT_HDR_RIGID* p_buf =

      reinterpret_cast<BT_HDR_RIGID*>(osi_malloc(sizeof(BT_HDR_RIGID)));
@@ -437,7 +435,7 @@ void btif_a2dp_sink_on_stopped(UNUSED_ATTR tBTA_AV_SUSPEND* p_av_suspend) { 
  btif_a2dp_sink_audio_handle_stop_decoding();

}



void btif_a2dp_sink_on_suspended(UNUSED_ATTR tBTA_AV_SUSPEND* p_av_suspend) {

void btif_a2dp_sink_on_suspended(tBTA_AV_SUSPEND* /* p_av_suspend */) {

  LOG_INFO("%s", __func__);

  BT_HDR_RIGID* p_buf =

      reinterpret_cast<BT_HDR_RIGID*>(osi_malloc(sizeof(BT_HDR_RIGID)));
@@ -486,7 +484,7 @@ static void btif_a2dp_sink_audio_handle_stop_decoding() { 
  }

}



static void btif_decode_alarm_cb(UNUSED_ATTR void* context) {

static void btif_decode_alarm_cb(void* /* context */) {

  LockGuard lock(g_mutex);

  btif_a2dp_sink_cb.worker_thread.DoInThread(

      FROM_HERE, base::BindOnce(btif_a2dp_sink_avk_handle_timer));
@@ -711,7 +709,7 @@ void btif_a2dp_sink_audio_rx_flush_req() { 
      FROM_HERE, base::BindOnce(btif_a2dp_sink_command_ready, p_buf));

}



void btif_a2dp_sink_debug_dump(UNUSED_ATTR int fd) {

void btif_a2dp_sink_debug_dump(int /* fd */) {

  // Nothing to do

}

system/btif/src/btif_dm.cc

+2 −5
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <mutex>

#include <optional>



#include <android_bluetooth_flags.h>

#include "advertise_data_parser.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/include/bta_api.h"
@@ -76,7 +75,6 @@ 
#include "os/log.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "osi/include/stack_power_telemetry.h"

#include "stack/btm/btm_dev.h"
@@ -3168,9 +3166,8 @@ void btif_dm_proc_io_req(tBTM_AUTH_REQ* p_auth_req, bool is_orig) { 
  LOG_VERBOSE("updated p_auth_req=%d", *p_auth_req);

}



void btif_dm_proc_io_rsp(UNUSED_ATTR const RawAddress& bd_addr,

                         tBTM_IO_CAP io_cap, UNUSED_ATTR tBTM_OOB_DATA oob_data,

                         tBTM_AUTH_REQ auth_req) {

void btif_dm_proc_io_rsp(const RawAddress& /* bd_addr */, tBTM_IO_CAP io_cap,

                         tBTM_OOB_DATA /* oob_data */, tBTM_AUTH_REQ auth_req) {

  if (auth_req & BTA_AUTH_BONDS) {

    LOG_DEBUG("auth_req:%d", auth_req);

    pairing_cb.auth_req = auth_req;

system/btif/src/btif_gatt_test.cc

+4 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "gatt_api.h"

#include "internal_include/bte_appl.h"

#include "os/log.h"

#include "osi/include/osi.h"

#include "stack/include/btm_ble_sec_api.h"

#include "types/ble_address_with_type.h"

#include "types/bluetooth/uuid.h"
@@ -91,7 +90,7 @@ static void btif_test_command_complete_cback(uint16_t conn_id, tGATTC_OPTYPE op, 
  }

}



static void btif_test_discovery_result_cback(UNUSED_ATTR uint16_t conn_id,

static void btif_test_discovery_result_cback(uint16_t /* conn_id */,

                                             tGATT_DISC_TYPE disc_type,

                                             tGATT_DISC_RES* p_data) {

  LOG_INFO("------ GATT Discovery result %-22s -------", disc_name[disc_type]);
@@ -145,8 +144,8 @@ static void btif_test_discovery_result_cback(UNUSED_ATTR uint16_t conn_id, 
  LOG_INFO("-----------------------------------------------------------");

}



static void btif_test_discovery_complete_cback(

    UNUSED_ATTR uint16_t conn_id, UNUSED_ATTR tGATT_DISC_TYPE disc_type,

static void btif_test_discovery_complete_cback(uint16_t /* conn_id */,

                                               tGATT_DISC_TYPE /* disc_type */,

                                               tGATT_STATUS status) {

  LOG_INFO("%s: status=%d", __func__, status);

}