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

Commit df8eb54a authored by Myles Watson's avatar Myles Watson
Browse files

Use GD controller to fill cmn_ble_vsc_cb 

Bug: 301661850
Bug: 321295665
Test: atest bluetooth_test_gd_unit
Change-Id: I1626bc03cc83163725fff5216626d303900a15e9
parent 04a9b591

system/stack/btm/btm_ble_gap.cc

+91 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "bt_dev_class.h"

#define LOG_TAG "bt_btm_ble"



#include <android_bluetooth_flags.h>

#include <android_bluetooth_sysprop.h>

#include <base/functional/bind.h>

#include <base/logging.h>
@@ -40,8 +41,10 @@ 
#include "bta/include/bta_api.h"

#include "common/time_util.h"

#include "device/include/controller.h"

#include "hci/controller.h"

#include "include/check.h"

#include "main/shim/acl_api.h"

#include "main/shim/entry.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "osi/include/properties.h"
@@ -93,6 +96,8 @@ static void btm_ble_stop_scan(); 
static tBTM_STATUS btm_ble_stop_adv(void);

static tBTM_STATUS btm_ble_start_adv(void);



using bluetooth::shim::GetController;



namespace {



constexpr char kBtmLogTag[] = "SCAN";
@@ -821,10 +826,93 @@ void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback) { 


  LOG_VERBOSE("BTM_BleReadControllerFeatures");



  if (IS_FLAG_ENABLED(report_vsc_data_from_the_gd_controller)) {

    btm_cb.cmn_ble_vsc_cb.values_read = true;

    bluetooth::hci::Controller::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.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_filter = vendor_capabilities.max_filter_;

    btm_cb.cmn_ble_vsc_cb.energy_support =

        vendor_capabilities.activity_energy_info_support_;



    btm_cb.cmn_ble_vsc_cb.version_supported =

        vendor_capabilities.version_supported_;

    btm_cb.cmn_ble_vsc_cb.total_trackable_advertisers =

        vendor_capabilities.total_num_of_advt_tracked_;

    btm_cb.cmn_ble_vsc_cb.extended_scan_support =

        vendor_capabilities.extended_scan_support_;

    btm_cb.cmn_ble_vsc_cb.debug_logging_supported =

        vendor_capabilities.debug_logging_supported_;



    btm_cb.cmn_ble_vsc_cb.le_address_generation_offloading_support =

        vendor_capabilities.le_address_generation_offloading_support_;

    btm_cb.cmn_ble_vsc_cb.a2dp_source_offload_capability_mask =

        vendor_capabilities.a2dp_source_offload_capability_mask_;

    btm_cb.cmn_ble_vsc_cb.quality_report_support =

        vendor_capabilities.bluetooth_quality_report_support_;

    btm_cb.cmn_ble_vsc_cb.dynamic_audio_buffer_support =

        vendor_capabilities.dynamic_audio_buffer_support_;



    if (vendor_capabilities.dynamic_audio_buffer_support_) {

      std::array<bluetooth::hci::DynamicAudioBufferCodecCapability,

                 BTM_CODEC_TYPE_MAX_RECORDS>

          capabilities = GetController()->GetDabCodecCapabilities();



      for (size_t i = 0; i < capabilities.size(); i++) {

        btm_cb.dynamic_audio_buffer_cb[i].default_buffer_time =

            capabilities[i].default_time_ms_;

        btm_cb.dynamic_audio_buffer_cb[i].maximum_buffer_time =

            capabilities[i].maximum_time_ms_;

        btm_cb.dynamic_audio_buffer_cb[i].minimum_buffer_time =

            capabilities[i].minimum_time_ms_;

      }

    }



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

        GetController()->GetLocalVersionInformation().manufacturer_name_ ==

            LMP_COMPID_QTI) {

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

      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;

    }



    LOG_VERBOSE("irk=%d, ADV ins:%d, rpa=%d, ener=%d, ext_scan=%d",

                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 (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);

    }



    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);

  }

}



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

 *

system/test/suite/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ cc_test { 
    static_libs: [

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",

        "libbluetooth_hci_pdl",

        "libbt-btu-main-thread",

        "libbt-jni-thread",

        "libbt-platform-protos-lite",
@@ -128,6 +129,9 @@ cc_test { 
    shared_libs: [

        "server_configurable_flags",

    ],

    generated_headers: [

        "BluetoothGeneratedDumpsysDataSchema_h",

    ],

    target: {

        android: {

            static_libs: [