Snap for 7599941 from 77f7385bc9af2e11f2c77fe78ad60b2918563da0 to sc-release (dcc55c57) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ static void bta_dm_ctrl_features_rd_cmpl_cback(tHCI_STATUS result);

		/* Disable timer interval (in milliseconds) */
		#ifndef BTA_DM_DISABLE_TIMER_MS
		#define BTA_DM_DISABLE_TIMER_MS 5000
		#define BTA_DM_DISABLE_TIMER_MS (2000)
		#endif

		/* Disable timer retrial interval (in milliseconds) */

+19 −0

Original line number	Diff line number	Diff line
		@@ -854,6 +854,25 @@ void BTM_BleAdvFilterParamSetup(
		FROM_HERE, HCI_BLE_ADV_FILTER, param,
		(uint8_t)(BTM_BLE_ADV_FILT_META_HDR_LENGTH),
		base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_FEAT_SEL, cb));

		auto entry = remove_me_later_map.find(filt_index);
		if (entry != remove_me_later_map.end()) {
		LOG_WARN("Replacing existing filter index entry with new address");
		// If device is not bonded, then try removing the device
		// If the device doesn't get removed then it is currently connected
		// (may be pairing?) If we do delete the device we want to erase the
		// filter index so we can replace it If the device is bonded, we
		// want to erase the filter index so we don't delete it in the later
		// BTM_LE_PF_clear call.
		if (!btm_sec_is_a_bonded_dev(entry->second)) {
		if (!BTM_SecDeleteDevice(entry->second)) {
		LOG_WARN("Unable to remove device, still connected.");
		return;
		}
		}
		remove_me_later_map.erase(filt_index);
		}

		} else if (BTM_BLE_SCAN_COND_CLEAR == action) {
		/* Deallocate all filters here */
		btm_ble_dealloc_addr_filter_counter(NULL, BTM_BLE_PF_TYPE_ALL);