Settings app does not show BLE devices (3bb6609b) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/include/bta_api.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -1351,6 +1351,12 @@ typedef tSDP_DISCOVERY_DB tBTA_DISCOVERY_DB;
		#define BTA_DM_LINK_TYPE_ALL 0xFF
		typedef UINT8 tBTA_DM_LINK_TYPE;

		#define IMMEDIATE_DELY_MODE 0x00
		#define ONFOUND_DELY_MODE 0x01
		#define BATCH_DELY_MODE 0x02
		#define ALLOW_ALL_FILTER 0x00
		#define LOWEST_RSSI_VALUE 129

		/*****************************************************************************
		** External Function Declarations
		*****************************************************************************/

system/btif/src/btif_dm.c

+55 −1

Original line number	Diff line number	Diff line
		@@ -161,6 +161,11 @@ static void btif_dm_ble_key_notif_evt(tBTA_DM_SP_KEY_NOTIF *p_ssp_key_notif);
		static void btif_dm_ble_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl);
		static void btif_dm_ble_passkey_req_evt(tBTA_DM_PIN_REQ *p_pin_req);
		#endif

		static void bte_scan_filt_param_cfg_evt(UINT8 action_type,
		tBTA_DM_BLE_PF_AVBL_SPACE avbl_space,
		tBTA_DM_BLE_REF_VALUE ref_value, tBTA_STATUS status);

		static char* btif_get_default_local_name();
		/******************************************************************************
		** Externs
		@@ -1121,6 +1126,12 @@ static void btif_dm_search_devices_evt (UINT16 event, char *p_param)

		case BTA_DM_INQ_CMPL_EVT:
		{
		#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
		tBTA_DM_BLE_PF_FILT_PARAMS adv_filt_param;
		memset(&adv_filt_param, 0, sizeof(tBTA_DM_BLE_PF_FILT_PARAMS));
		BTA_DmBleScanFilterSetup(BTA_DM_BLE_SCAN_COND_DELETE, 0, &adv_filt_param, NULL,
		bte_scan_filt_param_cfg_evt, 0);
		#endif
		}
		break;
		case BTA_DM_DISC_CMPL_EVT:
		@@ -1921,6 +1932,32 @@ static void bta_energy_info_cb(tBTA_DM_BLE_TX_TIME_MS tx_time, tBTA_DM_BLE_RX_TI
		}
		#endif

		/*******************************************************************************
		**
		** Function bte_scan_filt_param_cfg_evt
		**
		** Description Scan filter param config event
		**
		** Returns void
		**
		*******************************************************************************/
		static void bte_scan_filt_param_cfg_evt(UINT8 action_type,
		tBTA_DM_BLE_PF_AVBL_SPACE avbl_space,
		tBTA_DM_BLE_REF_VALUE ref_value, tBTA_STATUS status)
		{
		/* This event occurs on calling BTA_DmBleCfgFilterCondition internally,
		** and that is why there is no HAL callback
		*/
		if(BTA_SUCCESS != status)
		{
		BTIF_TRACE_ERROR("%s, %d", __FUNCTION__, status);
		}
		else
		{
		BTIF_TRACE_DEBUG("%s", __FUNCTION__);
		}
		}

		/*****************************************************************************
		**
		** btif api functions (no context switch)
		@@ -1940,12 +1977,29 @@ bt_status_t btif_dm_start_discovery(void)
		{
		tBTA_DM_INQ inq_params;
		tBTA_SERVICE_MASK services = 0;
		tBTA_DM_BLE_PF_FILT_PARAMS adv_filt_param;

		BTIF_TRACE_EVENT("%s", __FUNCTION__);

		#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
		memset(&adv_filt_param, 0, sizeof(tBTA_DM_BLE_PF_FILT_PARAMS));
		/* Cleanup anything remaining on index 0 */
		BTA_DmBleScanFilterSetup(BTA_DM_BLE_SCAN_COND_DELETE, 0, &adv_filt_param, NULL,
		bte_scan_filt_param_cfg_evt, 0);

		/* Add an allow-all filter on index 0*/
		adv_filt_param.dely_mode = IMMEDIATE_DELY_MODE;
		adv_filt_param.feat_seln = ALLOW_ALL_FILTER;
		adv_filt_param.filt_logic_type = BTA_DM_BLE_PF_FILT_LOGIC_OR;
		adv_filt_param.list_logic_type = BTA_DM_BLE_PF_LIST_LOGIC_OR;
		adv_filt_param.rssi_low_thres = LOWEST_RSSI_VALUE;
		adv_filt_param.rssi_high_thres = LOWEST_RSSI_VALUE;
		BTA_DmBleScanFilterSetup(BTA_DM_BLE_SCAN_COND_ADD, 0, &adv_filt_param, NULL,
		bte_scan_filt_param_cfg_evt, 0);

		/* TODO: Do we need to handle multiple inquiries at the same time? */

		/* Set inquiry params and call API */
		#if (defined(BLE_INCLUDED) && (BLE_INCLUDED == TRUE))
		inq_params.mode = BTA_DM_GENERAL_INQUIRY\|BTA_BLE_GENERAL_INQUIRY;
		#if (defined(BTA_HOST_INTERLEAVE_SEARCH) && BTA_HOST_INTERLEAVE_SEARCH == TRUE)
		inq_params.intl_duration[0]= BTIF_DM_INTERLEAVE_DURATION_BR_ONE;

system/btif/src/btif_gatt_client.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1447,7 +1447,8 @@ static void btgattc_handle_event(uint16_t event, char* p_param)
		{
		btgatt_adv_filter_cb_t p_adv_filt_cb = (btgatt_adv_filter_cb_t ) p_param;
		BTA_DmBleCfgFilterCondition(BTA_DM_BLE_SCAN_COND_CLEAR, BTA_DM_BLE_PF_TYPE_ALL,
		0, NULL, bta_scan_filt_cfg_cb, p_adv_filt_cb->client_if);
		p_adv_filt_cb->filt_index, NULL, bta_scan_filt_cfg_cb,
		p_adv_filt_cb->client_if);
		break;
		}

system/stack/btm/btm_ble_adv_filter.c

+174 −66

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/include/btm_ble_api.h

+9 −6

Original line number	Diff line number	Diff line
		@@ -587,10 +587,12 @@ typedef UINT8 tBTM_BLE_SCAN_COND_OP;

		enum
		{
		BTM_BLE_FILT_DISABLE = 0,
		BTM_BLE_FILT_ENABLE = 1
		BTM_BLE_FILT_ENABLE_DISABLE = 1,
		BTM_BLE_FILT_CFG = 2,
		BTM_BLE_FILT_ADV_PARAM = 3
		};
		typedef UINT8 tBTM_BLE_FILT_OP;

		typedef UINT8 tBTM_BLE_FILT_CB_EVT;

		/* BLE adv payload filtering config complete callback */
		typedef void (tBTM_BLE_PF_CFG_CBACK)(tBTM_BLE_PF_ACTION action, tBTM_BLE_SCAN_COND_OP cfg_op,
		@@ -661,8 +663,11 @@ typedef union

		typedef struct
		{
		UINT8 action_condtype[BTM_BLE_PF_TYPE_MAX];
		UINT8 action_ocf[BTM_BLE_PF_TYPE_MAX];
		tBTM_BLE_REF_VALUE ref_value[BTM_BLE_PF_TYPE_MAX];
		tBTM_BLE_PF_PARAM_CBACK *p_filt_param_cback[BTM_BLE_PF_TYPE_MAX];
		tBTM_BLE_PF_CFG_CBACK *p_scan_cfg_cback[BTM_BLE_PF_TYPE_MAX];
		UINT8 cb_evt[BTM_BLE_PF_TYPE_MAX];
		UINT8 pending_idx;
		UINT8 next_idx;
		}tBTM_BLE_ADV_FILTER_ADV_OPQ;
		@@ -683,8 +688,6 @@ typedef struct
		UINT8 op_type;
		tBTM_BLE_PF_COUNT addr_filter_count[BTM_BLE_MAX_FILTER_COUNTER]; /* per BDA filter indexed by tBTM_BLE_PF_COND_TYPE */
		tBLE_BD_ADDR cur_filter_target;
		tBTM_BLE_PF_CFG_CBACK *p_scan_cfg_cback;
		tBTM_BLE_PF_PARAM_CBACK *p_filt_param_cback;
		tBTM_BLE_PF_STATUS_CBACK *p_filt_stat_cback;
		tBTM_BLE_ADV_FILTER_ADV_OPQ op_q;
		}tBTM_BLE_ADV_FILTER_CB;