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

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

Merge "BQR: Correct the type of tx_power_level to signed int." am: 7fc3ba30 am: 88d7e1d5 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1352283

Change-Id: Ia0a0ba721610f57d0d3344fc34db760a28d1669b
parents ba6c8bbd 88d7e1d5

system/btif/include/btif_bqr.h

+2 −3
Original line number Diff line number Diff line
@@ -27,8 +27,7 @@ namespace bqr { 
// Bluetooth Quality Report (BQR)

//

// It is a feature to start the mechanism in the Bluetooth controller to report

// Bluetooth Quality event to the host and there are four options could be

// enabled:

// Bluetooth Quality event to the host and the following options can be enabled:

//   [Quality Monitoring Mode]

//     The controller shall periodically send Bluetooth Quality Report sub-event

//     to the host.
@@ -204,7 +203,7 @@ typedef struct { 
  uint8_t connection_role;

  // Current Transmit Power Level for the connection. This value is the same as

  // the controller's response to the HCI_Read_Transmit_Power_Level HCI command.

  uint8_t tx_power_level;

  int8_t tx_power_level;

  // Received Signal Strength Indication (RSSI) value for the connection. This

  // value is an absolute receiver signal strength value.

  int8_t rssi;

system/btif/src/btif_bqr.cc

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void BqrVseSubEvt::ParseBqrLinkQualityEvt(uint8_t length, 
  STREAM_TO_UINT8(bqr_link_quality_event_.packet_types, p_param_buf);

  STREAM_TO_UINT16(bqr_link_quality_event_.connection_handle, p_param_buf);

  STREAM_TO_UINT8(bqr_link_quality_event_.connection_role, p_param_buf);

  STREAM_TO_UINT8(bqr_link_quality_event_.tx_power_level, p_param_buf);

  STREAM_TO_INT8(bqr_link_quality_event_.tx_power_level, p_param_buf);

  STREAM_TO_INT8(bqr_link_quality_event_.rssi, p_param_buf);

  STREAM_TO_UINT8(bqr_link_quality_event_.snr, p_param_buf);

  STREAM_TO_UINT8(bqr_link_quality_event_.unused_afh_channel_count,
@@ -124,7 +124,7 @@ std::string BqrVseSubEvt::ToString() const { 
     << ", Handle: " << loghex(bqr_link_quality_event_.connection_handle)

     << ", " << PacketTypeToString(bqr_link_quality_event_.packet_types) << ", "

     << ((bqr_link_quality_event_.connection_role == 0) ? "Master" : "Slave ")

     << ", PwLv: " << loghex(bqr_link_quality_event_.tx_power_level)

     << ", PwLv: " << std::to_string(bqr_link_quality_event_.tx_power_level)

     << ", RSSI: " << std::to_string(bqr_link_quality_event_.rssi)

     << ", SNR: " << std::to_string(bqr_link_quality_event_.snr)

     << ", UnusedCh: "