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

Commit 9934096c authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I54a70e49,I364c746f into main 

* changes:
  Remove report_vsc_data_from_the_gd_controller flag
  Remove report_vsc_data_from_the_gd_controller
parents 30e2aa74 68db5409

flags/vsc.aconfig

+0 −7
Original line number Diff line number Diff line 
package: "com.android.bluetooth.flags"

container: "com.android.btservices"
 


flag {

    name: "report_vsc_data_from_the_gd_controller"

    namespace: "bluetooth"

    description: "Remove hand parsing of the VSC capabilities packets"

    bug: "321295665"

}
 
 No newline at end of file

system/stack/btm/btm_ble_gap.cc

+73 −248
Original line number Diff line number Diff line
@@ -645,170 +645,6 @@ tBTM_STATUS BTM_BleObserve(bool start, uint8_t duration, 
  return status;

}



static void btm_get_dynamic_audio_buffer_vsc_cmpl_cback(

    tBTM_VSC_CMPL* p_vsc_cmpl_params) {

  log::info("");



  if (p_vsc_cmpl_params->param_len < 1) {

    log::error("The length of returned parameters is less than 1");

    return;

  }

  uint8_t* p_event_param_buf = p_vsc_cmpl_params->p_param_buf;

  uint8_t status = 0xff;

  uint8_t opcode = 0xff;

  uint32_t codec_mask = 0xffffffff;



  // [Return Parameter]         | [Size]   | [Purpose]

  // Status                     | 1 octet  | Command complete status

  // Dynamic_Audio_Buffer_opcode| 1 octet  | 0x01 - Get buffer time

  // Audio_Codedc_Type_Supported| 4 octet  | Bit masks for selected codec types

  // Audio_Codec_Buffer_Time    | 192 octet| Default/Max/Min buffer time

  STREAM_TO_UINT8(status, p_event_param_buf);

  if (status != HCI_SUCCESS) {

    log::error("Fail to configure DFTB. status: 0x{:x}", status);

    return;

  }



  if (p_vsc_cmpl_params->param_len != 198) {

    log::fatal("The length of returned parameters is not equal to 198: {}",

               p_vsc_cmpl_params->param_len);

    return;

  }



  STREAM_TO_UINT8(opcode, p_event_param_buf);

  log::info("opcode = 0x{:x}", opcode);



  if (opcode == 0x01) {

    STREAM_TO_UINT32(codec_mask, p_event_param_buf);

    log::info("codec_mask = 0x{:x}", codec_mask);



    for (int i = 0; i < BTM_CODEC_TYPE_MAX_RECORDS; i++) {

      STREAM_TO_UINT16(btm_cb.dynamic_audio_buffer_cb[i].default_buffer_time,

                       p_event_param_buf);

      STREAM_TO_UINT16(btm_cb.dynamic_audio_buffer_cb[i].maximum_buffer_time,

                       p_event_param_buf);

      STREAM_TO_UINT16(btm_cb.dynamic_audio_buffer_cb[i].minimum_buffer_time,

                       p_event_param_buf);

    }



    log::info("Succeed to receive Media Tx Buffer.");

  }

}



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

 *

 * Function         btm_vsc_brcm_features_complete

 *

 * Description      Command Complete callback for HCI_BLE_VENDOR_CAP

 *

 * Returns          void

 *

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

static void btm_ble_vendor_capability_vsc_cmpl_cback(

    tBTM_VSC_CMPL* p_vcs_cplt_params) {

  log::verbose("");



  /* Check status of command complete event */

  log::assert_that(

      p_vcs_cplt_params->opcode == HCI_BLE_VENDOR_CAP,

      "assert failed: p_vcs_cplt_params->opcode == HCI_BLE_VENDOR_CAP");

  log::assert_that(p_vcs_cplt_params->param_len > 0,

                   "assert failed: p_vcs_cplt_params->param_len > 0");



  const uint8_t* p = p_vcs_cplt_params->p_param_buf;

  uint8_t raw_status;

  STREAM_TO_UINT8(raw_status, p);

  tHCI_STATUS status = to_hci_status_code(raw_status);



  if (status != HCI_SUCCESS) {

    log::verbose("Status = 0x{:02x} (0 is success)", status);

    return;

  }

  log::assert_that(

      p_vcs_cplt_params->param_len >= BTM_VSC_CHIP_CAPABILITY_RSP_LEN,

      "assert failed: p_vcs_cplt_params->param_len >= "

      "BTM_VSC_CHIP_CAPABILITY_RSP_LEN");

  STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.adv_inst_max, p);

  STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.rpa_offloading, p);

  STREAM_TO_UINT16(btm_cb.cmn_ble_vsc_cb.tot_scan_results_strg, p);

  STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.max_irk_list_sz, p);

  STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.filter_support, p);

  STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.max_filter, p);

  STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.energy_support, p);



  if (p_vcs_cplt_params->param_len >

      BTM_VSC_CHIP_CAPABILITY_RSP_LEN_L_RELEASE) {

    STREAM_TO_UINT16(btm_cb.cmn_ble_vsc_cb.version_supported, p);

  } else {

    btm_cb.cmn_ble_vsc_cb.version_supported = BTM_VSC_CHIP_CAPABILITY_L_VERSION;

  }



  if (btm_cb.cmn_ble_vsc_cb.version_supported >=

      BTM_VSC_CHIP_CAPABILITY_M_VERSION) {

    log::assert_that(p_vcs_cplt_params->param_len >=

                         BTM_VSC_CHIP_CAPABILITY_RSP_LEN_M_RELEASE,

                     "assert failed: p_vcs_cplt_params->param_len >= "

                     "BTM_VSC_CHIP_CAPABILITY_RSP_LEN_M_RELEASE");

    STREAM_TO_UINT16(btm_cb.cmn_ble_vsc_cb.total_trackable_advertisers, p);

    STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.extended_scan_support, p);

    STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.debug_logging_supported, p);

  }



  if (btm_cb.cmn_ble_vsc_cb.version_supported >=

      BTM_VSC_CHIP_CAPABILITY_S_VERSION) {

    if (p_vcs_cplt_params->param_len >=

        BTM_VSC_CHIP_CAPABILITY_RSP_LEN_S_RELEASE) {

      STREAM_TO_UINT8(

          btm_cb.cmn_ble_vsc_cb.le_address_generation_offloading_support, p);

      STREAM_TO_UINT32(

          btm_cb.cmn_ble_vsc_cb.a2dp_source_offload_capability_mask, p);

      STREAM_TO_UINT8(btm_cb.cmn_ble_vsc_cb.quality_report_support, p);

      STREAM_TO_UINT32(btm_cb.cmn_ble_vsc_cb.dynamic_audio_buffer_support, p);



      if (btm_cb.cmn_ble_vsc_cb.dynamic_audio_buffer_support != 0) {

        uint8_t param[3] = {0};

        uint8_t* p_param = param;



        UINT8_TO_STREAM(p_param, HCI_CONTROLLER_DAB_GET_BUFFER_TIME);

        BTM_VendorSpecificCommand(HCI_CONTROLLER_DAB, p_param - param, param,

                                  btm_get_dynamic_audio_buffer_vsc_cmpl_cback);

      }

    }

  }



  if (btm_cb.cmn_ble_vsc_cb.filter_support == 1 &&

      bluetooth::shim::GetController()

              ->GetLocalVersionInformation()

              .manufacturer_name_ == LMP_COMPID_QTI) {

    // QTI controller, TDS data filter are supported by default. Check is added

    // to keep backward compatibility.

    btm_cb.cmn_ble_vsc_cb.adv_filter_extended_features_mask = 0x01;

  } else {

    btm_cb.cmn_ble_vsc_cb.adv_filter_extended_features_mask = 0x00;

  }



  btm_cb.cmn_ble_vsc_cb.values_read = true;



  log::verbose("stat={}, irk={}, ADV ins:{}, rpa={}, ener={}, ext_scan={}",

               status, btm_cb.cmn_ble_vsc_cb.max_irk_list_sz,

               btm_cb.cmn_ble_vsc_cb.adv_inst_max,

               btm_cb.cmn_ble_vsc_cb.rpa_offloading,

               btm_cb.cmn_ble_vsc_cb.energy_support,

               btm_cb.cmn_ble_vsc_cb.extended_scan_support);



  if (btm_cb.cmn_ble_vsc_cb.max_filter > 0) btm_ble_adv_filter_init();



  /* VS capability included and non-4.2 device */

  if (bluetooth::shim::GetController()->SupportsBle() &&

      bluetooth::shim::GetController()->SupportsBlePrivacy() &&

      btm_cb.cmn_ble_vsc_cb.max_irk_list_sz > 0 &&

      bluetooth::shim::GetController()->GetLeResolvingListSize() == 0)

    btm_ble_resolving_list_init(btm_cb.cmn_ble_vsc_cb.max_irk_list_sz);



  if (p_ctrl_le_feature_rd_cmpl_cback != NULL)

    p_ctrl_le_feature_rd_cmpl_cback(static_cast<tHCI_STATUS>(status));

}



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

 *

 * Function         BTM_BleGetVendorCapabilities
@@ -856,22 +692,17 @@ void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback) { 


  log::verbose("BTM_BleReadControllerFeatures");



  if (com::android::bluetooth::flags::

          report_vsc_data_from_the_gd_controller()) {

  btm_cb.cmn_ble_vsc_cb.values_read = true;

    bluetooth::hci::ControllerInterface::VendorCapabilities

        vendor_capabilities = GetController()->GetVendorCapabilities();

  bluetooth::hci::ControllerInterface::VendorCapabilities vendor_capabilities =

      GetController()->GetVendorCapabilities();



    btm_cb.cmn_ble_vsc_cb.adv_inst_max =

        vendor_capabilities.max_advt_instances_;

  btm_cb.cmn_ble_vsc_cb.adv_inst_max = vendor_capabilities.max_advt_instances_;

  btm_cb.cmn_ble_vsc_cb.rpa_offloading =

      vendor_capabilities.offloaded_resolution_of_private_address_;

  btm_cb.cmn_ble_vsc_cb.tot_scan_results_strg =

      vendor_capabilities.total_scan_results_storage_;

    btm_cb.cmn_ble_vsc_cb.max_irk_list_sz =

        vendor_capabilities.max_irk_list_sz_;

    btm_cb.cmn_ble_vsc_cb.filter_support =

        vendor_capabilities.filtering_support_;

  btm_cb.cmn_ble_vsc_cb.max_irk_list_sz = vendor_capabilities.max_irk_list_sz_;

  btm_cb.cmn_ble_vsc_cb.filter_support = vendor_capabilities.filtering_support_;

  btm_cb.cmn_ble_vsc_cb.max_filter = vendor_capabilities.max_filter_;

  btm_cb.cmn_ble_vsc_cb.energy_support =

      vendor_capabilities.activity_energy_info_support_;
@@ -930,8 +761,7 @@ void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback) { 
  if (btm_cb.cmn_ble_vsc_cb.max_filter > 0) btm_ble_adv_filter_init();



  /* VS capability included and non-4.2 device */

    if (GetController()->SupportsBle() &&

        GetController()->SupportsBlePrivacy() &&

  if (GetController()->SupportsBle() && GetController()->SupportsBlePrivacy() &&

      btm_cb.cmn_ble_vsc_cb.max_irk_list_sz > 0 &&

      GetController()->GetLeResolvingListSize() == 0) {

    btm_ble_resolving_list_init(btm_cb.cmn_ble_vsc_cb.max_irk_list_sz);
@@ -940,11 +770,6 @@ void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback) { 
  if (p_vsc_cback != NULL) {

    p_vsc_cback(tHCI_STATUS::HCI_SUCCESS);

  }

  } else {

    p_ctrl_le_feature_rd_cmpl_cback = p_vsc_cback;

    BTM_VendorSpecificCommand(HCI_BLE_VENDOR_CAP, 0, NULL,

                              btm_ble_vendor_capability_vsc_cmpl_cback);

  }

}



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