LE ADV Filter changes (8469d3a2) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,6 @@ LOCAL_SRC_FILES:= \
		./jv/bta_jv_cfg.c \
		./jv/bta_jv_main.c \
		./jv/bta_jv_api.c \
		../vnd/ble/bta_vendor.c

		LOCAL_MODULE := libbt-brcm_bta
		LOCAL_MODULE_CLASS := STATIC_LIBRARIES

system/bta/dm/bta_dm_act.c

+157 −44

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* Copyright (C) 2003-2012 Broadcom Corporation
		* Copyright (C) 2003-2014 Broadcom Corporation
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -5462,6 +5462,162 @@ void bta_ble_scan_setup_cb(tBTM_BLE_BATCH_SCAN_EVT evt, tBTM_BLE_REF_VALUE ref_v
		bta_dm_cb.p_setup_cback(bta_evt, ref_value, status);
		}


		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		/*******************************************************************************
		**
		** Function bta_ble_scan_pf_cmpl
		**
		** Description ADV payload filtering operation complete callback
		**
		**
		** Returns TRUE if handled, otherwise FALSE.
		**
		*******************************************************************************/
		static void bta_ble_scan_cfg_cmpl(tBTM_BLE_PF_ACTION action, tBTM_BLE_SCAN_COND_OP cfg_op,
		tBTM_BLE_PF_AVBL_SPACE avbl_space, tBTM_STATUS status,
		tBTM_BLE_REF_VALUE ref_value)
		{
		tBTA_STATUS st = (status == BTM_SUCCESS) ? BTA_SUCCESS: BTA_FAILURE;

		APPL_TRACE_DEBUG("bta_ble_scan_cfg_cmpl: %d, %d, %d, %d", action, cfg_op, avbl_space, status);

		if(bta_dm_cb.p_scan_filt_cfg_cback)
		bta_dm_cb.p_scan_filt_cfg_cback(action, cfg_op, avbl_space, st, ref_value);
		}

		/*******************************************************************************
		**
		** Function bta_ble_enable_scan_cmpl
		**
		** Description ADV payload filtering enable / disable complete callback
		**
		**
		** Returns None
		**
		*******************************************************************************/
		static void bta_ble_status_cmpl(tBTM_BLE_PF_ACTION action, tBTM_BLE_REF_VALUE ref_value,
		tBTM_STATUS status)
		{
		tBTA_STATUS st = (status == BTM_SUCCESS) ? BTA_SUCCESS: BTA_FAILURE;

		APPL_TRACE_DEBUG("bta_ble_status_cmpl: %d, %d", action, status);

		if(bta_dm_cb.p_scan_filt_status_cback)
		bta_dm_cb.p_scan_filt_status_cback(action, ref_value, st);
		}

		/*******************************************************************************
		**
		** Function bta_dm_cfg_filter_cond
		**
		** Description This function configure adv payload filtering condition
		**
		** Parameters:
		**
		*******************************************************************************/
		void bta_dm_cfg_filter_cond (tBTA_DM_MSG *p_data)
		{
		tBTM_STATUS st = BTM_MODE_UNSUPPORTED;
		tBTA_STATUS status = BTA_FAILURE;

		tBTM_BLE_VSC_CB cmn_vsc_cb;

		APPL_TRACE_DEBUG("bta_dm_cfg_filter_cond");
		BTM_BleGetVendorCapabilities(&cmn_vsc_cb);
		if(0 != cmn_vsc_cb.filter_support)
		{
		if ((st = BTM_BleCfgFilterCondition(p_data->ble_cfg_filter_cond.action,
		p_data->ble_cfg_filter_cond.cond_type,
		(tBTM_BLE_PF_FILT_INDEX)p_data->ble_cfg_filter_cond.filt_index,
		(tBTM_BLE_PF_COND_PARAM *)p_data->ble_cfg_filter_cond.p_cond_param,
		bta_ble_scan_cfg_cmpl, p_data->ble_cfg_filter_cond.ref_value))
		== BTM_CMD_STARTED)
		{
		bta_dm_cb.p_scan_filt_cfg_cback = p_data->ble_cfg_filter_cond.p_filt_cfg_cback;
		return;
		}
		}

		if (p_data->ble_cfg_filter_cond.p_filt_cfg_cback)
		p_data->ble_cfg_filter_cond.p_filt_cfg_cback(BTA_DM_BLE_PF_CONFIG_EVT,
		p_data->ble_cfg_filter_cond.cond_type, 0, status,
		p_data->ble_cfg_filter_cond.ref_value);
		return;
		}

		/*******************************************************************************
		**
		** Function bta_dm_enable_scan_filter
		**
		** Description This function enable/disable adv payload filtering condition
		**
		** Parameters:
		**
		*******************************************************************************/
		void bta_dm_enable_scan_filter(tBTA_DM_MSG *p_data)
		{
		tBTM_STATUS st = BTM_MODE_UNSUPPORTED;
		tBTA_STATUS status = BTA_FAILURE;

		tBTM_BLE_VSC_CB cmn_vsc_cb;
		APPL_TRACE_DEBUG("bta_dm_enable_scan_filter");
		BTM_BleGetVendorCapabilities(&cmn_vsc_cb);

		if(0 != cmn_vsc_cb.filter_support)
		{
		if((st = BTM_BleEnableDisableFilterFeature(p_data->ble_enable_scan_filt.action,
		p_data->ble_enable_scan_filt.p_filt_status_cback,
		(tBTM_BLE_REF_VALUE)p_data->ble_enable_scan_filt.ref_value)) == BTM_CMD_STARTED)
		bta_dm_cb.p_scan_filt_status_cback = p_data->ble_enable_scan_filt.p_filt_status_cback;
		return;
		}

		if (p_data->ble_enable_scan_filt.p_filt_status_cback)
		p_data->ble_enable_scan_filt.p_filt_status_cback (BTA_DM_BLE_PF_ENABLE_EVT,
		p_data->ble_enable_scan_filt.ref_value, status);

		}
		/*******************************************************************************
		**
		** Function bta_dm_scan_filter_param_setup
		**
		** Description This function sets up scan filter params
		**
		** Parameters:
		**
		*******************************************************************************/
		void bta_dm_scan_filter_param_setup (tBTA_DM_MSG *p_data)
		{
		tBTM_STATUS st = BTM_MODE_UNSUPPORTED;
		tBTA_STATUS status = BTA_FAILURE;

		tBTM_BLE_VSC_CB cmn_vsc_cb;

		APPL_TRACE_DEBUG("bta_dm_scan_filter_param_setup");
		BTM_BleGetVendorCapabilities(&cmn_vsc_cb);
		if(0 != cmn_vsc_cb.filter_support)
		{
		if ((st = BTM_BleAdvFilterParamSetup(p_data->ble_scan_filt_param_setup.action,
		p_data->ble_scan_filt_param_setup.filt_index,
		(tBTM_BLE_PF_FILT_PARAMS *)p_data->ble_scan_filt_param_setup.p_filt_params,
		p_data->ble_scan_filt_param_setup.p_target,
		p_data->ble_scan_filt_param_setup.p_filt_param_cback,
		p_data->ble_scan_filt_param_setup.ref_value)) == BTM_CMD_STARTED)
		{
		bta_dm_cb.p_scan_filt_param_cback = p_data->ble_scan_filt_param_setup.p_filt_param_cback;
		return;
		}
		}

		if (p_data->ble_scan_filt_param_setup.p_filt_param_cback)
		p_data->ble_scan_filt_param_setup.p_filt_param_cback (BTA_DM_BLE_PF_ENABLE_EVT, 0,
		p_data->ble_scan_filt_param_setup.ref_value, status);

		return;
		}
		#endif

		#if ((defined BTA_GATT_INCLUDED) && (BTA_GATT_INCLUDED == TRUE))
		#ifndef BTA_DM_GATT_CLOSE_DELAY_TOUT
		#define BTA_DM_GATT_CLOSE_DELAY_TOUT 1000
		@@ -5799,49 +5955,6 @@ static void bta_dm_gattc_callback(tBTA_GATTC_EVT event, tBTA_GATTC *p_data)

		#endif /* BTA_GATT_INCLUDED */

		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		/*******************************************************************************
		**
		** Function bta_dm_enable_scan_filter
		**
		** Description This function enable/disable adv payload filtering condition
		**
		** Parameters:
		**
		*******************************************************************************/
		void bta_dm_enable_scan_filter (tBTA_DM_MSG *p_data)
		{
		tBTA_SYS_VS_BLE_SCAN_PF_ENABLE param;

		param.enable = p_data->ble_enable_scan_filter.enable;
		param.p_target = p_data->ble_enable_scan_filter.p_target;
		param.p_cmpl_cback = p_data->ble_enable_scan_filter.p_cmpl_cback;

		bta_sys_vs_hdl(BTA_VS_BLE_SCAN_PF_ENABLE_EVT, (void *)&param);
		}

		/*******************************************************************************
		**
		** Function bta_dm_cfg_filter_cond
		**
		** Description This function configure adv payload filtering condition
		**
		** Parameters:
		**
		*******************************************************************************/
		void bta_dm_cfg_filter_cond (tBTA_DM_MSG *p_data)
		{
		tBTA_SYS_VS_BLE_SCAN_PF_COND param;

		param.action = p_data->ble_cfg_filter_cond.action;
		param.cond_type = p_data->ble_cfg_filter_cond.cond_type;
		param.p_cond = (void *)p_data->ble_cfg_filter_cond.p_cond_param;
		param.p_cmpl_cback = p_data->ble_cfg_filter_cond.p_cmpl_cback;

		bta_sys_vs_hdl(BTA_VS_BLE_SCAN_PF_COND_EVT, (void *)&param);
		}
		#endif /* BLE_ANDROID_CONTROLLER_SCAN_FILTER */

		/*******************************************************************************
		**
		** Function bta_dm_ctrl_features_rd_cmpl_cback

system/bta/dm/bta_dm_api.c

+209 −1

Original line number	Diff line number	Diff line
		@@ -1628,6 +1628,7 @@ BTA_API extern void BTA_DmBleSetStorageParams(UINT8 batch_scan_full_max,
		** scan_window - Scan window
		** discard_rule -Discard rules
		** addr_type - Address type
		** ref_value - Reference value
		**
		** Returns None
		**
		@@ -1659,7 +1660,7 @@ BTA_API extern void BTA_DmBleEnableBatchScan(tBTA_BLE_SCAN_MODE scan_mode,
		**
		** Description This function is called to disable the batch scan
		**
		** Parameters
		** Parameters ref_value - Reference value
		**
		** Returns None
		**
		@@ -1684,6 +1685,7 @@ BTA_API extern void BTA_DmBleDisableBatchScan(tBTA_DM_BLE_REF_VALUE ref_value)
		** Description This function is called to read scan reports
		**
		** Parameters scan_type -Batch scan mode
		** ref_value - Reference value
		**
		** Returns None
		**
		@@ -2134,6 +2136,212 @@ tBTA_STATUS BTA_BleDisableAdvInstance (UINT8 inst_id)
		return BTA_FAILURE;
		}

		/*******************************************************************************
		**
		** Function BTA_DmBleCfgFilterCondition
		**
		** Description This function is called to configure the adv data payload filter
		** condition.
		**
		** Parameters action: to read/write/clear
		** cond_type: filter condition type
		** filt_index - Filter index
		** p_cond: filter condition parameter
		** p_cmpl_back - Command completed callback
		** ref_value - Reference value
		**
		** Returns void
		**
		*******************************************************************************/
		void BTA_DmBleCfgFilterCondition(tBTA_DM_BLE_SCAN_COND_OP action,
		tBTA_DM_BLE_PF_COND_TYPE cond_type,
		tBTA_DM_BLE_PF_FILT_INDEX filt_index,
		tBTA_DM_BLE_PF_COND_PARAM *p_cond,
		tBTA_DM_BLE_PF_CFG_CBACK *p_cmpl_cback,
		tBTA_DM_BLE_REF_VALUE ref_value)
		{
		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		tBTA_DM_API_CFG_FILTER_COND *p_msg;
		APPL_TRACE_API ("BTA_DmBleCfgFilterCondition: %d, %d", action, cond_type);

		UINT16 len = sizeof(tBTA_DM_API_CFG_FILTER_COND) + sizeof(tBTA_DM_BLE_PF_COND_PARAM) + \
		BTM_BLE_PF_STR_LEN_MAX + BTM_BLE_PF_STR_LEN_MAX + sizeof(tBTA_DM_BLE_PF_COND_MASK);

		UINT8 *p;

		if ((p_msg = (tBTA_DM_API_CFG_FILTER_COND *) GKI_getbuf(len)) != NULL)
		{
		memset (p_msg, 0, len);

		p_msg->hdr.event = BTA_DM_API_CFG_FILTER_COND_EVT;
		p_msg->action = action;
		p_msg->cond_type = cond_type;
		p_msg->filt_index = filt_index;
		p_msg->p_filt_cfg_cback = p_cmpl_cback;
		p_msg->ref_value = ref_value;
		if (p_cond)
		{
		p_msg->p_cond_param = (tBTA_DM_BLE_PF_COND_PARAM *)(p_msg + 1);
		memcpy(p_msg->p_cond_param, p_cond, sizeof(tBTA_DM_BLE_PF_COND_PARAM));

		p = (UINT8 *)(p_msg->p_cond_param + 1);

		if (cond_type == BTA_DM_BLE_PF_SRVC_DATA_PATTERN \|\|
		cond_type == BTA_DM_BLE_PF_MANU_DATA)
		{
		p_msg->p_cond_param->manu_data.p_pattern = p;
		p_msg->p_cond_param->manu_data.data_len = p_cond->manu_data.data_len;
		memcpy(p_msg->p_cond_param->manu_data.p_pattern, p_cond->manu_data.p_pattern,
		p_cond->manu_data.data_len);
		p += p_cond->manu_data.data_len;

		if (cond_type == BTA_DM_BLE_PF_MANU_DATA)
		{
		p_msg->p_cond_param->manu_data.company_id_mask =
		p_cond->manu_data.company_id_mask;
		if ( p_cond->manu_data.p_pattern_mask != NULL)
		{
		p_msg->p_cond_param->manu_data.p_pattern_mask = p;
		memcpy(p_msg->p_cond_param->manu_data.p_pattern_mask,
		p_cond->manu_data.p_pattern_mask, p_cond->manu_data.data_len);
		}
		}
		}
		else if (cond_type == BTA_DM_BLE_PF_LOCAL_NAME)
		{
		p_msg->p_cond_param->local_name.p_data = p;
		memcpy(p_msg->p_cond_param->local_name.p_data,
		p_cond->local_name.p_data, p_cond->local_name.data_len);
		}
		else if ((cond_type == BTM_BLE_PF_SRVC_UUID \|\| cond_type == BTM_BLE_PF_SRVC_SOL_UUID))
		{
		if (p_cond->srvc_uuid.p_target_addr != NULL)
		{
		p_msg->p_cond_param->srvc_uuid.p_target_addr = (tBLE_BD_ADDR *)(p);
		p_msg->p_cond_param->srvc_uuid.p_target_addr->type =
		p_cond->srvc_uuid.p_target_addr->type;
		memcpy(p_msg->p_cond_param->srvc_uuid.p_target_addr->bda,
		p_cond->srvc_uuid.p_target_addr->bda, BD_ADDR_LEN);
		p = (UINT8*)( p_msg->p_cond_param->srvc_uuid.p_target_addr + 1);
		}
		if (p_cond->srvc_uuid.p_uuid_mask)
		{
		p_msg->p_cond_param->srvc_uuid.p_uuid_mask = (tBTA_DM_BLE_PF_COND_MASK *)p;
		memcpy(p_msg->p_cond_param->srvc_uuid.p_uuid_mask,
		p_cond->srvc_uuid.p_uuid_mask, sizeof(tBTA_DM_BLE_PF_COND_MASK));
		}
		}
		}

		bta_sys_sendmsg(p_msg);
		}
		#else
		UNUSED(action);
		UNUSED(cond_type);
		UNUSED(filt_index);
		UNUSED(p_cond);
		UNUSED(p_cmpl_cback);
		UNUSED(ref_value);
		#endif
		}

		/*******************************************************************************
		**
		** Function BTA_DmBleScanFilterSetup
		**
		** Description This function is called to setup the adv data payload filter param
		**
		** Parameters p_target: enable the filter condition on a target device; if NULL
		** filt_index - Filter index
		** p_filt_params -Filter parameters
		** ref_value - Reference value
		** action - Add, delete or clear
		** p_cmpl_back - Command completed callback
		**
		** Returns void
		**
		*******************************************************************************/
		void BTA_DmBleScanFilterSetup(UINT8 action, tBTA_DM_BLE_PF_FILT_INDEX filt_index,
		tBTA_DM_BLE_PF_FILT_PARAMS *p_filt_params,
		tBLE_BD_ADDR *p_target,
		tBTA_DM_BLE_PF_PARAM_CBACK *p_cmpl_cback,
		tBTA_DM_BLE_REF_VALUE ref_value)
		{
		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		tBTA_DM_API_SCAN_FILTER_PARAM_SETUP *p_msg;
		APPL_TRACE_API ("BTA_DmBleScanFilterSetup: %d", action);

		UINT16 len = sizeof(tBTA_DM_API_SCAN_FILTER_PARAM_SETUP) + sizeof(tBLE_BD_ADDR);

		if ((p_msg = (tBTA_DM_API_SCAN_FILTER_PARAM_SETUP *) GKI_getbuf(len)) != NULL)
		{
		memset (p_msg, 0, len);

		p_msg->hdr.event = BTA_DM_API_SCAN_FILTER_SETUP_EVT;
		p_msg->action = action;
		p_msg->filt_index = filt_index;
		p_msg->p_filt_params = p_filt_params;
		p_msg->p_filt_param_cback = p_cmpl_cback;
		p_msg->ref_value = ref_value;

		if (p_target)
		{
		p_msg->p_target = (tBLE_BD_ADDR *)(p_msg + 1);
		memcpy(p_msg->p_target, p_target, sizeof(tBLE_BD_ADDR));
		}

		bta_sys_sendmsg(p_msg);
		}
		#else
		UNUSED(action);
		UNUSED(filt_index);
		UNUSED(p_filt_params);
		UNUSED(p_target);
		UNUSED(p_cmpl_cback);
		UNUSED(ref_value);
		#endif
		}

		/*******************************************************************************
		**
		** Function BTA_DmEnableScanFilter
		**
		** Description This function is called to enable the adv data payload filter
		**
		** Parameters action - enable or disable the APCF feature
		** p_cmpl_cback - Command completed callback
		** ref_value - Reference value
		**
		** Returns void
		**
		*******************************************************************************/
		void BTA_DmEnableScanFilter(UINT8 action, tBTA_DM_BLE_PF_STATUS_CBACK *p_cmpl_cback,
		tBTA_DM_BLE_REF_VALUE ref_value)
		{
		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		tBTA_DM_API_ENABLE_SCAN_FILTER *p_msg;
		APPL_TRACE_API ("BTA_DmEnableScanFilter: %d", action);

		UINT16 len = sizeof(tBTA_DM_API_ENABLE_SCAN_FILTER) + sizeof(tBLE_BD_ADDR);

		if ((p_msg = (tBTA_DM_API_ENABLE_SCAN_FILTER *) GKI_getbuf(len)) != NULL)
		{
		memset (p_msg, 0, len);

		p_msg->hdr.event = BTA_DM_API_SCAN_FILTER_ENABLE_EVT;
		p_msg->action = action;
		p_msg->ref_value = ref_value;
		p_msg->p_filt_status_cback = p_cmpl_cback;

		bta_sys_sendmsg(p_msg);
		}
		#else
		UNUSED(action);
		UNUSED(p_cmpl_cback);
		UNUSED(ref_value);
		#endif
		}

		/*******************************************************************************
		**
		** Function BTA_DmBleUpdateConnectionParams

system/bta/dm/bta_dm_int.h

+26 −8

Original line number	Diff line number	Diff line
		@@ -112,7 +112,8 @@ enum

		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		BTA_DM_API_CFG_FILTER_COND_EVT,
		BTA_DM_API_ENABLE_SCAN_FILTER_EVT,
		BTA_DM_API_SCAN_FILTER_SETUP_EVT,
		BTA_DM_API_SCAN_FILTER_ENABLE_EVT,
		#endif
		BTA_DM_API_BLE_MULTI_ADV_ENB_EVT,
		BTA_DM_API_BLE_MULTI_ADV_PARAM_UPD_EVT,
		@@ -694,17 +695,30 @@ typedef struct
		BT_HDR hdr;
		tBTA_DM_BLE_SCAN_COND_OP action;
		tBTA_DM_BLE_PF_COND_TYPE cond_type;
		tBTA_DM_BLE_PF_FILT_INDEX filt_index;
		tBTA_DM_BLE_PF_COND_PARAM *p_cond_param;
		void *p_cmpl_cback;
		tBTA_DM_BLE_PF_CFG_CBACK *p_filt_cfg_cback;
		tBTA_DM_BLE_REF_VALUE ref_value;
		}tBTA_DM_API_CFG_FILTER_COND;

		typedef struct
		{
		BT_HDR hdr;
		BOOLEAN enable;
		tBLE_BD_ADDR *p_target;
		void *p_cmpl_cback;
		UINT8 action;
		tBTA_DM_BLE_PF_STATUS_CBACK *p_filt_status_cback;
		tBTA_DM_BLE_REF_VALUE ref_value;
		}tBTA_DM_API_ENABLE_SCAN_FILTER;

		typedef struct
		{
		BT_HDR hdr;
		UINT8 action;
		tBTA_DM_BLE_PF_FILT_INDEX filt_index;
		tBTA_DM_BLE_PF_FILT_PARAMS *p_filt_params;
		tBLE_BD_ADDR *p_target;
		tBTA_DM_BLE_PF_PARAM_CBACK *p_filt_param_cback;
		tBTA_DM_BLE_REF_VALUE ref_value;
		}tBTA_DM_API_SCAN_FILTER_PARAM_SETUP;
		#endif

		/* union of all data types */
		@@ -783,8 +797,9 @@ typedef union
		tBTA_DM_API_BLE_ADV_PARAMS ble_set_adv_params;
		tBTA_DM_API_SET_ADV_CONFIG ble_set_adv_data;
		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		tBTA_DM_API_ENABLE_SCAN_FILTER ble_enable_scan_filter;
		tBTA_DM_API_SCAN_FILTER_PARAM_SETUP ble_scan_filt_param_setup;
		tBTA_DM_API_CFG_FILTER_COND ble_cfg_filter_cond;
		tBTA_DM_API_ENABLE_SCAN_FILTER ble_enable_scan_filt;
		#endif
		tBTA_DM_API_UPDATE_CONN_PARAM ble_update_conn_params;
		tBTA_DM_API_BLE_MULTI_ADV_ENB ble_multi_adv_enb;
		@@ -900,7 +915,9 @@ typedef struct
		tBTA_DM_ACTIVE_LINK device_list;
		tBTA_DM_SEC_CBACK *p_sec_cback;
		tBTA_BLE_SCAN_SETUP_CBACK *p_setup_cback;
		void *p_ref;
		tBTA_DM_BLE_PF_CFG_CBACK *p_scan_filt_cfg_cback;
		tBTA_DM_BLE_PF_STATUS_CBACK *p_scan_filt_status_cback;
		tBTA_DM_BLE_PF_PARAM_CBACK *p_scan_filt_param_cback;
		TIMER_LIST_ENT signal_strength_timer;
		tBTA_SIG_STRENGTH_MASK signal_strength_mask;
		UINT16 state;
		@@ -1167,8 +1184,9 @@ extern void bta_dm_ble_set_scan_rsp (tBTA_DM_MSG *p_data);
		extern void bta_dm_ble_broadcast (tBTA_DM_MSG *p_data);

		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		extern void bta_dm_enable_scan_filter (tBTA_DM_MSG *p_data);
		extern void bta_dm_cfg_filter_cond (tBTA_DM_MSG *p_data);
		extern void bta_dm_scan_filter_param_setup (tBTA_DM_MSG *p_data);
		extern void bta_dm_enable_scan_filter(tBTA_DM_MSG *p_data);
		#endif
		extern void btm_dm_ble_multi_adv_disable(tBTA_DM_MSG *p_data);
		extern void bta_dm_ble_multi_adv_data(tBTA_DM_MSG *p_data);

system/bta/dm/bta_dm_main.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -106,7 +106,8 @@ const tBTA_DM_ACTION bta_dm_action[] =
		bta_dm_ble_broadcast, /* BTA_DM_API_BLE_BROADCAST_EVT */
		#if BLE_ANDROID_CONTROLLER_SCAN_FILTER == TRUE
		bta_dm_cfg_filter_cond, /* BTA_DM_API_CFG_FILTER_COND_EVT */
		bta_dm_enable_scan_filter, /* BTA_DM_API_ENABLE_SCAN_FILTER_EVT */
		bta_dm_scan_filter_param_setup, /* BTA_DM_API_SCAN_FILTER_SETUP_EVT */
		bta_dm_enable_scan_filter, /* BTA_DM_API_SCAN_FILTER_ENABLE_EVT */
		#endif
		bta_dm_ble_multi_adv_enb, /* BTA_DM_API_BLE_MULTI_ADV_ENB_EVT*/
		bta_dm_ble_multi_adv_upd_param, /* BTA_DM_API_BLE_MULTI_ADV_PARAM_UPD_EVT */