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

Commit 55753001 authored by Satya Calloji's avatar Satya Calloji Committed by Prerepa Viswanadham
Browse files

Tx power is 0 in ADV packet 

b/15412969 Tx power is always 0 in advertising packet

Change-Id: I7eb1f16b5fb1ab4ed669ba6a72f9603885cebc99
parent b05eb16e

system/btif/src/btif_gatt_multi_adv_util.c

+0 −1
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ BOOLEAN btif_gattc_copy_datacb(int cbindex, btif_adv_data_t *p_adv_data, BOOLEAN 
       return false;



    BTIF_TRACE_DEBUG("%s", __FUNCTION__);

    memset(&p_multi_adv_data_cb->inst_cb[cbindex],0, sizeof(btgatt_multi_adv_inst_cb));

    memset(&p_multi_adv_data_cb->inst_cb[cbindex].data, 0, sizeof(tBTA_BLE_ADV_DATA));



    if (!p_adv_data->set_scan_rsp)

system/stack/btm/btm_ble_gap.c

+3 −2
Original line number Diff line number Diff line
@@ -1192,9 +1192,10 @@ UINT8 *btm_ble_build_adv_data(tBTM_BLE_AD_MASK *p_data_mask, UINT8 **p_dst, 
        {

            *p++ = MIN_ADV_LENGTH;

            *p++ = BTM_BLE_AD_TYPE_TX_PWR;

            *p++ = p_data->tx_power;

            if (p_data->tx_power > BTM_BLE_ADV_TX_POWER_MAX)

                p_data->tx_power = BTM_BLE_ADV_TX_POWER_MAX;

            *p++ = btm_ble_map_adv_tx_power(p_data->tx_power);

            len -= 3;



            data_mask &= ~BTM_BLE_AD_BIT_TX_PWR;

        }

        /* 16 bits services */

system/stack/btm/btm_ble_int.h

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ extern void btm_ble_multi_adv_init(void); 
extern void btm_ble_batchscan_init(void);

extern void btm_ble_multi_adv_reenable(UINT8 inst_id);

extern void btm_ble_multi_adv_enb_privacy(BOOLEAN enable);

extern char btm_ble_map_adv_tx_power(int tx_power_index);

extern void btm_ble_adv_filter_init(void);

extern BOOLEAN btm_ble_topology_check(tBTM_BLE_STATE_MASK request);

extern BOOLEAN btm_ble_clear_topology_mask(tBTM_BLE_STATE_MASK request_state);

system/stack/btm/btm_ble_multi_adv.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ tBTM_STATUS btm_ble_enable_multi_adv (BOOLEAN enable, UINT8 inst_id, UINT8 cb_ev 
**

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

int btm_ble_tx_power[BTM_BLE_ADV_TX_POWER_MAX + 1] = BTM_BLE_ADV_TX_POWER;

static char btm_ble_map_adv_tx_power(int tx_power_index)

char btm_ble_map_adv_tx_power(int tx_power_index)

{

    if(0 <= tx_power_index && tx_power_index < BTM_BLE_ADV_TX_POWER_MAX)

        return (char)btm_ble_tx_power[tx_power_index];