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

Commit 26e9c7e5 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Gerrit Code Review
Browse files

Merge "Log redacted Bluetooth device address" into main

parents 09d3b019 d3bdc4ae

system/bta/gatt/bta_gatts_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ void bta_gatts_close(tBTA_GATTS_CB* /* p_cb */, tBTA_GATTS_DATA* p_msg) { 
  if (GATT_GetConnectionInfor(p_msg->hdr.layer_specific, &gatt_if, remote_bda,

                              &transport)) {

    log::debug("Disconnecting gatt_if={}, remote_bda={}, transport={}", gatt_if,

               remote_bda.ToString(), transport);

               remote_bda, transport);

    status = GATT_Disconnect(p_msg->hdr.layer_specific);

    if (status != GATT_SUCCESS) {

      log::error("fail conn_id={}", p_msg->hdr.layer_specific);

system/btif/src/btif_config.cc

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ bool btif_get_device_clockoffset(const RawAddress& bda, int* p_clock_offset) { 
                           p_clock_offset))

    return false;



  log::debug("Device [{}] clock_offset {}", bd_addr_str, *p_clock_offset);

  log::debug("Device [{}] clock_offset {}", bda, *p_clock_offset);

  return true;

}
@@ -205,7 +205,7 @@ bool btif_set_device_clockoffset(const RawAddress& bda, int clock_offset) { 
                           clock_offset))

    return false;



  log::debug("Device [{}] clock_offset {}", bd_addr_str, clock_offset);

  log::debug("Device [{}] clock_offset {}", bda, clock_offset);

  return true;

}

system/gd/os/chromeos/metrics.cc

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ void LogMetricA2dpAudioOverrunEvent( 
  log::debug(

      "A2dpAudioOverrun: {}, {}, {}, {}, {}, {}",

      boot_id,

      addr_string,

      address,

      (long long unsigned)encoding_interval_millis,

      num_dropped_buffers,

      num_dropped_encoded_bytes,
@@ -98,7 +98,7 @@ void LogMetricHfpPacketLossStats( 
  log::debug(

      "HfpPacketLoss: {}, {}, {}, {:f}, {}",

      boot_id,

      addr_string,

      address,

      num_decoded_frames,

      packet_loss_ratio,

      codec_type);
@@ -211,7 +211,7 @@ void LogMetricA2dpSessionMetricsEvent( 
  log::debug(

      "A2dpSessionMetrics: {}, {}, {}, {}, {}, {}, {}, {}, {}, {:f}, {}, {}, {}",

      boot_id,

      addr_string,

      address,

      (long long int)audio_duration_ms,

      media_timer_min_ms,

      media_timer_max_ms,

system/stack/gatt/gatt_sr.cc

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ static void gatts_process_mtu_req(tGATT_TCB& tcb, uint16_t cid, uint16_t len, 
  gatt_sr_msg.mtu = gatt_get_local_mtu();



  log::info("MTU {} request from remote ({}), resulted MTU {}", mtu,

            tcb.peer_bda.ToString(), tcb.payload_size);

            tcb.peer_bda, tcb.payload_size);



  BTM_SetBleDataLength(tcb.peer_bda, tcb.payload_size + L2CAP_PKT_OVERHEAD);