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

Commit a54d63e2 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge changes Id3dde894,I8d586fab,I3d8c5700,I06f2d9a2,I64b8a1b7, ... into main 

* changes:
  Remove unused function btif_storage_get_remote_addr_type
  Remove unused function btif_storage_set_remote_addr_type
  Remove unused function btif_storage_get_remote_device_type
  Remove unused function btif_storage_set_remote_device_type
  Remove unused function BTA_VendorInit
  Remove unused function bta_sys_ssr_cfg_register
  Remove unused function bta_sys_chg_ssr_config
  Remove unused function BTA_GetEirService
  Remove unused function bta_dm_close_acl
  Remove unused function BTA_DmCloseACL
  Remove unused function bta_dm_disc_stop_service_discovery
  Remove unused function BTA_AvOffloadStartRsp
  Remove unused function bta_av_set_scb_sst_incoming
  Remove unused function bta_av_rc_browse_close
  Remove unused function bta_av_is_scb_init
  Remove unused function BTM_GetClockOffset
  Remove unused function BTM_default_block_role_switch
  Remove unused function BTM_BothEndsSupportSecureConnections
  Remove unused function BTM_BleReadDiscoverability
  Remove unused function BTM_BleReadConnectability
  Remove unused function BTM_BleMaxMultiAdvInstanceCount
  Remove unused function btif_storage_remove_ble_local_keys
  Remove unused function tm_ble_biginfo_adv_report_rcvd
  Remove unused function btm_ble_periodic_syc_transfer_param_cmpl
  Remove unused function btm_ble_periodic_syc_transfer_cmd_cmpl
  Remove unused symbol btm_ble_dir_adv_tout
  Remove unused symbol btm_ble_periodic_adv_sync_tx_rcvd
  Remove unused function btif_gatt_move_track_adv_data
  Remove unused function btif_storage_get_num_bonded_devices
  Missing android metric impl bluetooth::os::void LogMetricMmcTranscodeRttStats
parents 78119d5f d6c1269b

system/bta/av/bta_av_act.cc

+0 −13
Original line number Diff line number Diff line
@@ -1177,19 +1177,6 @@ void bta_av_rc_close(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) { 
  }

}



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

 *

 * Function         bta_av_rc_browse_close

 *

 * Description      Empty placeholder.

 *

 * Returns          void

 *

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

void bta_av_rc_browse_close(tBTA_AV_CB* p_cb, tBTA_AV_DATA* p_data) {

  log::warn("empty placeholder does nothing!");

}



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

 *

 * Function         bta_av_get_shdl

system/bta/av/bta_av_api.cc

+0 −20
Original line number Diff line number Diff line
@@ -268,26 +268,6 @@ void BTA_AvOffloadStart(tBTA_AV_HNDL hndl) { 
  bta_sys_sendmsg(p_buf);

}



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

 *

 * Function         BTA_AvOffloadStartRsp

 *

 * Description      Response from vendor lib for A2DP Offload Start request.

 *

 * Returns          void

 *

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

void BTA_AvOffloadStartRsp(tBTA_AV_HNDL hndl, tBTA_AV_STATUS status) {

  tBTA_AV_API_STATUS_RSP* p_buf =

      (tBTA_AV_API_STATUS_RSP*)osi_malloc(sizeof(tBTA_AV_API_STATUS_RSP));



  p_buf->hdr.event = BTA_AV_API_OFFLOAD_START_RSP_EVT;

  p_buf->hdr.layer_specific = hndl;

  p_buf->status = status;



  bta_sys_sendmsg(p_buf);

}



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

 *

 * Function         BTA_AvStop

system/bta/av/bta_av_int.h

+0 −2
Original line number Diff line number Diff line
@@ -741,8 +741,6 @@ void bta_av_stream_chg(tBTA_AV_SCB* p_scb, bool started); 
bool bta_av_is_scb_opening(tBTA_AV_SCB* p_scb);

bool bta_av_is_scb_incoming(tBTA_AV_SCB* p_scb);

void bta_av_set_scb_sst_init(tBTA_AV_SCB* p_scb);

bool bta_av_is_scb_init(tBTA_AV_SCB* p_scb);

void bta_av_set_scb_sst_incoming(tBTA_AV_SCB* p_scb);

tBTA_AV_LCB* bta_av_find_lcb(const RawAddress& addr, uint8_t op);

const char* bta_av_sst_code(uint8_t state);

void bta_av_free_scb(tBTA_AV_SCB* p_scb);

system/bta/av/bta_av_ssm.cc

+0 −36
Original line number Diff line number Diff line
@@ -531,42 +531,6 @@ void bta_av_set_scb_sst_init(tBTA_AV_SCB* p_scb) { 
  p_scb->state = next_state;

}



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

 *

 * Function         bta_av_is_scb_init

 *

 * Description      Returns true is scb is in init state.

 *

 *

 * Returns          true if scb is in incoming state.

 *

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

bool bta_av_is_scb_init(tBTA_AV_SCB* p_scb) {

  bool is_init = false;



  if (p_scb) {

    if (p_scb->state == BTA_AV_INIT_SST) is_init = true;

  }



  return is_init;

}



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

 *

 * Function         bta_av_set_scb_sst_incoming

 *

 * Description      Set SST state to incoming.

 *                  Use this function to change SST outside of state machine.

 *

 * Returns          None

 *

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

void bta_av_set_scb_sst_incoming(tBTA_AV_SCB* p_scb) {

  if (p_scb) {

    p_scb->state = BTA_AV_INCOMING_SST;

  }

}



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

 *  Debug Functions

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

system/bta/dm/bta_dm_act.cc

+0 −36
Original line number Diff line number Diff line
@@ -554,42 +554,6 @@ void bta_dm_remove_device(const RawAddress& bd_addr) { 
  }

}



/** This function forces to close the connection to a remote device and

 * optionaly remove the device from security database if required. */

void bta_dm_close_acl(const RawAddress& bd_addr, bool remove_dev,

                      tBT_TRANSPORT transport) {

  uint8_t index;



  log::verbose("bta_dm_close_acl");



  if (BTM_IsAclConnectionUp(bd_addr, transport)) {

    for (index = 0; index < bta_dm_cb.device_list.count; index++) {

      if (bta_dm_cb.device_list.peer_device[index].peer_bdaddr == bd_addr)

        break;

    }

    if (index != bta_dm_cb.device_list.count) {

      if (remove_dev) {

        log::info("Setting remove_dev_pending for {}",

                  ADDRESS_TO_LOGGABLE_CSTR(bd_addr));

        bta_dm_cb.device_list.peer_device[index].remove_dev_pending = true;

      }

    } else {

      log::error("unknown device, remove ACL failed");

    }



    /* Make sure device is not in acceptlist before we disconnect */

    GATT_CancelConnect(0, bd_addr, false);



    /* Disconnect the ACL link */

    btm_remove_acl(bd_addr, transport);

  }

  /* if to remove the device from security database ? do it now */

  else if (remove_dev) {

    bta_dm_process_remove_device_no_callback(bd_addr);

  }

  /* otherwise, no action needed */

}



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

 *

 * Function         bta_dm_local_name_cback