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

Commit 400f25a8 authored by Satya Calloji's avatar Satya Calloji Committed by Andre Eisenbach
Browse files

Fix for chip capability version check 

Fixes the issue of extended scan command being sent out
for non-capable chipsets

Bug: 20916419
Change-Id: Ib5d848f49c34a3fc9c053a7488e12fb0c252587c
parent 3bb3e632

system/stack/btm/btm_ble_gap.c

+4 −5
Original line number Diff line number Diff line
@@ -525,8 +525,7 @@ static void btm_ble_vendor_capability_vsc_cmpl_cback (tBTM_VSC_CMPL *p_vcs_cplt_ 
            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_L_VERSION &&

            btm_cb.cmn_ble_vsc_cb.version_supported <= BTM_VSC_CHIP_CAPABILITY_M_VERSION)

        if (btm_cb.cmn_ble_vsc_cb.version_supported == BTM_VSC_CHIP_CAPABILITY_M_VERSION)

        {

            STREAM_TO_UINT16(btm_cb.cmn_ble_vsc_cb.total_trackable_advertisers, p);

            STREAM_TO_UINT16(btm_cb.cmn_ble_vsc_cb.extended_scan_support, p);
@@ -535,10 +534,10 @@ static void btm_ble_vendor_capability_vsc_cmpl_cback (tBTM_VSC_CMPL *p_vcs_cplt_ 
        btm_cb.cmn_ble_vsc_cb.values_read = TRUE;

    }



    BTM_TRACE_DEBUG("%s: stat=%d, irk=%d, ADV ins:%d, rpa=%d, ener=%d",

    BTM_TRACE_DEBUG("%s: stat=%d, irk=%d, ADV ins:%d, rpa=%d, ener=%d, ext_scan=%d",

         __func__, 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.energy_support, btm_cb.cmn_ble_vsc_cb.extended_scan_support);



    if (BTM_BleMaxMultiAdvInstanceCount() > 0)

        btm_ble_multi_adv_init();
@@ -3299,7 +3298,7 @@ void btm_ble_init (void) 
{

    tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb;



    BTM_TRACE_EVENT ("btm_ble_init ");

    BTM_TRACE_DEBUG("%s", __func__);



    memset(p_cb, 0, sizeof(tBTM_BLE_CB));

    memset(&(btm_cb.cmn_ble_vsc_cb), 0 , sizeof(tBTM_BLE_VSC_CB));