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

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

OnFound/OnLost feature changes based on Google spec v0.90 

Bug: 19609671
Change-Id: If9e61b405a141cb77fb65741d08227284cb22ccd
parent fd6d05a3

system/bta/dm/bta_dm_act.c

+9 −2
Original line number Diff line number Diff line
@@ -5000,17 +5000,24 @@ void bta_dm_ble_track_advertiser(tBTA_DM_MSG *p_data) 
    BD_ADDR bda;

    memset(&bda, 0 , sizeof(BD_ADDR));

    tBTM_BLE_VSC_CB cmn_ble_vsc_cb;

    tBTA_DM_BLE_TRACK_ADV_DATA track_adv_data;



    BTM_BleGetVendorCapabilities(&cmn_ble_vsc_cb);



    if (0 != cmn_ble_vsc_cb.tot_scan_results_strg)

    {

        btm_status = BTM_BleTrackAdvertiser(p_data->ble_track_advert.p_track_adv_cback,

        btm_status = BTM_BleTrackAdvertiser((tBTM_BLE_TRACK_ADV_CBACK *)

                                            p_data->ble_track_advert.p_track_adv_cback,

                                            p_data->ble_track_advert.ref_value);

    }



    if(BTM_CMD_STARTED != btm_status)

       p_data->ble_track_advert.p_track_adv_cback(0, 0, bda, 0, p_data->ble_track_advert.ref_value);

    {

        memset(&track_adv_data, 0, sizeof(tBTA_DM_BLE_TRACK_ADV_DATA));

        track_adv_data.advertiser_info_present = NO_ADV_INFO_PRESENT; /* Indicates failure */

        track_adv_data.client_if = (UINT8)p_data->ble_track_advert.ref_value;

        p_data->ble_track_advert.p_track_adv_cback(&track_adv_data);

    }

}



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

system/bta/include/bta_api.h

+9 −2
Original line number Diff line number Diff line
@@ -992,6 +992,7 @@ typedef UINT8 tBTA_DM_BLE_PF_RSSI_THRESHOLD; 
typedef UINT8  tBTA_DM_BLE_PF_DELIVERY_MODE;

typedef UINT16 tBTA_DM_BLE_PF_TIMEOUT;

typedef UINT8  tBTA_DM_BLE_PF_TIMEOUT_CNT;

typedef UINT16 tBTA_DM_BLE_PF_ADV_TRACK_ENTRIES;



typedef struct

{
@@ -1004,6 +1005,7 @@ typedef struct 
    tBTA_DM_BLE_PF_TIMEOUT found_timeout;

    tBTA_DM_BLE_PF_TIMEOUT lost_timeout;

    tBTA_DM_BLE_PF_TIMEOUT_CNT found_timeout_cnt;

    tBTA_DM_BLE_PF_ADV_TRACK_ENTRIES num_of_tracking_entries;

} tBTA_DM_BLE_PF_FILT_PARAMS;



/* Search callback events */
@@ -1117,6 +1119,12 @@ typedef tBTM_BLE_ENERGY_USED tBTA_DM_BLE_ENERGY_USED; 


typedef UINT8 tBTA_DM_CONTRL_STATE;



typedef UINT8 tBTA_DM_BLE_ADV_STATE;

typedef UINT8 tBTA_DM_BLE_ADV_INFO_PRESENT;

typedef UINT8 tBTA_DM_BLE_RSSI_VALUE;

typedef UINT16 tBTA_DM_BLE_ADV_INFO_TIMESTAMP;



typedef tBTM_BLE_TRACK_ADV_DATA tBTA_DM_BLE_TRACK_ADV_DATA;



typedef void (tBTA_BLE_SCAN_THRESHOLD_CBACK)(tBTA_DM_BLE_REF_VALUE ref_value);
@@ -1132,8 +1140,7 @@ typedef void (tBTA_BLE_TRACK_ADV_CMPL_CBACK)(int action, tBTA_STATUS status, 
                                             tBTA_DM_BLE_PF_AVBL_SPACE avbl_space,

                                             tBTA_DM_BLE_REF_VALUE ref_value);



typedef void (tBTA_BLE_TRACK_ADV_CBACK)(int filt_index, tBLE_ADDR_TYPE addr_type, BD_ADDR bda,

                                        int adv_state, tBTA_DM_BLE_REF_VALUE ref_value);

typedef void (tBTA_BLE_TRACK_ADV_CBACK)(tBTA_DM_BLE_TRACK_ADV_DATA *p_adv_data);



typedef void (tBTA_BLE_ENERGY_INFO_CBACK)(tBTA_DM_BLE_TX_TIME_MS tx_time,

                                          tBTA_DM_BLE_RX_TIME_MS rx_time,

system/btif/include/btif_gatt_util.h

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,8 @@ uint16_t set_read_value(btgatt_read_params_t *p_dest, tBTA_GATTC_READ *p_src); 
uint16_t get_uuid16(tBT_UUID *p_uuid);



void btif_gatt_check_encrypted_link(BD_ADDR bd_addr);

extern void btif_gatt_move_track_adv_data(btgatt_track_adv_info_t *p_dest,

                                btgatt_track_adv_info_t *p_src);



#endif

system/btif/src/btif_core.c

+4 −4
Original line number Diff line number Diff line
@@ -850,11 +850,11 @@ static void execute_storage_request(UINT16 event, char *p_param) 
                local_le_features.max_adv_instance = cmn_vsc_cb.adv_inst_max;

                local_le_features.max_irk_list_size = cmn_vsc_cb.max_irk_list_sz;

                local_le_features.rpa_offload_supported = cmn_vsc_cb.rpa_offloading;

                local_le_features.scan_result_storage_size_hibyte =

                    (cmn_vsc_cb.tot_scan_results_strg >> 8) & (0xFF);

                local_le_features.scan_result_storage_size_lobyte =

                    (cmn_vsc_cb.tot_scan_results_strg) & (0xFF);

                local_le_features.scan_result_storage_size = cmn_vsc_cb.tot_scan_results_strg;

                local_le_features.activity_energy_info_supported = cmn_vsc_cb.energy_support;

                local_le_features.version_supported = cmn_vsc_cb.version_supported;

                local_le_features.total_trackable_advertisers =

                    cmn_vsc_cb.total_trackable_advertisers;

                memcpy(prop.val, &local_le_features, prop.len);

                #endif

            }

system/btif/src/btif_dm.c

+4 −4
Original line number Diff line number Diff line
@@ -1908,11 +1908,11 @@ static void btif_dm_upstreams_evt(UINT16 event, char* p_param) 
            local_le_features.max_adv_instance = cmn_vsc_cb.adv_inst_max;

            local_le_features.max_irk_list_size = cmn_vsc_cb.max_irk_list_sz;

            local_le_features.rpa_offload_supported = cmn_vsc_cb.rpa_offloading;

            local_le_features.scan_result_storage_size_hibyte =

                (cmn_vsc_cb.tot_scan_results_strg >> 8) & (0xFF);

            local_le_features.scan_result_storage_size_lobyte =

                (cmn_vsc_cb.tot_scan_results_strg) & (0xFF);

            local_le_features.activity_energy_info_supported = cmn_vsc_cb.energy_support;

            local_le_features.scan_result_storage_size = cmn_vsc_cb.tot_scan_results_strg;

            local_le_features.version_supported = cmn_vsc_cb.version_supported;

            local_le_features.total_trackable_advertisers =

                        cmn_vsc_cb.total_trackable_advertisers;

            memcpy(prop.val, &local_le_features, prop.len);

            HAL_CBACK(bt_hal_cbacks, adapter_properties_cb, BT_STATUS_SUCCESS, 1, &prop);

            break;