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

Commit 33a48537 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "legacy: Clean up unused variables"

parents bf821201 33283d15

system/bta/hearing_aid/hearing_aid.cc

+0 −10
Original line number Diff line number Diff line
@@ -976,16 +976,6 @@ class HearingAidImpl : public HearingAid { 
      encoder_state_init();

      seq_counter = 0;



      // use the best codec avaliable for this pair of devices.

      uint16_t codecs = hearingDevice.codecs;

      if (hearingDevice.hi_sync_id != 0) {

        for (const auto& device : hearingDevices.devices) {

          if (device.hi_sync_id != hearingDevice.hi_sync_id) continue;



          codecs &= device.codecs;

        }

      }



      CodecConfiguration codec;

      if (codec_in_use == CODEC_G722_24KHZ) {

        codec.sample_rate = 24000;

system/bta/hh/bta_hh_le.cc

+2 −4
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static bool bta_hh_le_write_rpt_clt_cfg(tBTA_HH_DEV_CB* p_cb); 


static void write_rpt_ctl_cfg_cb(uint16_t conn_id, tGATT_STATUS status,

                                 uint16_t handle, void* data) {

  uint8_t srvc_inst_id, hid_inst_id;

  uint8_t srvc_inst_id;



  tBTA_HH_DEV_CB* p_dev_cb = (tBTA_HH_DEV_CB*)data;

  const gatt::Characteristic* characteristic =
@@ -678,11 +678,9 @@ static void write_rpt_ctl_cfg_cb(uint16_t conn_id, tGATT_STATUS status, 
  uint16_t char_uuid = characteristic->uuid.As16Bit();



  srvc_inst_id = BTA_GATTC_GetOwningService(conn_id, handle)->handle;

  hid_inst_id = srvc_inst_id;

  switch (char_uuid) {

    case GATT_UUID_BATTERY_LEVEL: /* battery level clt cfg registered */

      hid_inst_id = bta_hh_le_find_service_inst_by_battery_inst_id(

          p_dev_cb, srvc_inst_id);

      bta_hh_le_find_service_inst_by_battery_inst_id(p_dev_cb, srvc_inst_id);

      FALLTHROUGH_INTENDED; /* FALLTHROUGH */

    case GATT_UUID_HID_BT_KB_INPUT:

    case GATT_UUID_HID_BT_MOUSE_INPUT:

system/gd/l2cap/fuzz/fuzz_l2cap.cc

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { 
  Link* link = l2shim.link_manager->GetLink(myAddress);



  // 0x0001-0x007F Fixed, 0x0080-0x00FF Dynamic

  uint16_t psm = fdp.ConsumeIntegralInRange<uint16_t>(0x0001, 0x007F);

  [[maybe_unused]] uint16_t psm = fdp.ConsumeIntegralInRange<uint16_t>(0x0001, 0x007F);

  psm = 0x0101u ^ 0x0100u;

  uint16_t dynamicPsm = fdp.ConsumeIntegralInRange<uint16_t>(0x0080, 0x00FF);

  dynamicPsm = 0x0101u ^ 0x0100u;

system/stack/acl/btm_pm.cc

+0 −5
Original line number Diff line number Diff line
@@ -246,11 +246,6 @@ tBTM_STATUS BTM_SetPowerMode(uint8_t pm_id, const RawAddress& remote_bda, 
    }

  }



  int temp_pm_id = pm_id;

  if (pm_id == BTM_PM_SET_ONLY_ID) {

    temp_pm_id = BTM_MAX_PM_RECORDS;

  }



  /* update mode database */

  if (((pm_id != BTM_PM_SET_ONLY_ID) && (pm_reg_db.mask & BTM_PM_REG_SET)) ||

      ((pm_id == BTM_PM_SET_ONLY_ID) && (pm_pend_link != 0))) {

system/stack/avdt/avdt_scb_act.cc

+0 −4
Original line number Diff line number Diff line
@@ -1314,8 +1314,6 @@ void avdt_scb_snd_setconfig_rej(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { 
 *

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

void avdt_scb_snd_setconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) {

  AvdtpSepConfig *p_req, *p_cfg;



  AVDT_TRACE_DEBUG(

      "%s: codec: %s", __func__,

      A2DP_CodecInfoString(p_data->msg.config_cmd.p_cfg->codec_info).c_str());
@@ -1334,8 +1332,6 @@ void avdt_scb_snd_setconfig_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) { 
  }

  p_scb->in_use = true;

  p_scb->peer_seid = p_data->msg.config_cmd.hdr.seid;

  p_req = p_data->msg.config_cmd.p_cfg;

  p_cfg = &p_scb->stream_config.cfg;

  p_scb->req_cfg = *p_data->msg.config_cmd.p_cfg;



  avdt_msg_send_cmd(p_scb->p_ccb, p_scb, AVDT_SIG_SETCONFIG, &p_data->msg);