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

Commit 554a5626 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the... 

Merge "BQR: Fix for the issue that Bluetooth keeps on crashing if the controller firmware does not support the BQR feature."
parents 47a958f4 f4c99c05

system/btif/src/btif_bqr.cc

+2 −4
Original line number Original line Diff line number Diff line
@@ -243,8 +243,7 @@ void EnableBtQualityReport(bool is_enable) { 




void BqrVscCompleteCallback(tBTM_VSC_CMPL* p_vsc_cmpl_params) {

void BqrVscCompleteCallback(tBTM_VSC_CMPL* p_vsc_cmpl_params) {

  if (p_vsc_cmpl_params->param_len < 1) {

  if (p_vsc_cmpl_params->param_len < 1) {

    LOG(FATAL) << __func__

    LOG(ERROR) << __func__ << ": The length of returned parameters is less than 1";

               << ": The length of returned parameters is less than 1";

    return;

    return;

  }

  }
@@ -255,8 +254,7 @@ void BqrVscCompleteCallback(tBTM_VSC_CMPL* p_vsc_cmpl_params) { 
  // Current_Quality_Event_Mask | 4 octets | Indicates current bit mask setting

  // Current_Quality_Event_Mask | 4 octets | Indicates current bit mask setting

  STREAM_TO_UINT8(status, p_event_param_buf);

  STREAM_TO_UINT8(status, p_event_param_buf);

  if (status != HCI_SUCCESS) {

  if (status != HCI_SUCCESS) {

    LOG(FATAL) << __func__

    LOG(ERROR) << __func__ << ": Fail to configure BQR. status: " << loghex(status);

               << ": Fail to configure BQR. status: " << loghex(status);

    return;

    return;

  }

  }