Merge "legacy: Use proper type btif/src/btif_dm::tBTM_STATUS" (5a741884) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/btif_dm.cc

+6 −6

Original line number	Diff line number	Diff line
		@@ -228,7 +228,7 @@ static void btif_dm_ble_sc_oob_req_evt(tBTA_DM_SP_RMT_OOB* req_oob_type);

		static void bte_scan_filt_param_cfg_evt(tBTM_BLE_SCAN_COND_OP action_type,
		uint8_t avbl_space, uint8_t ref_value,
		uint8_t btm_status);
		tBTM_STATUS btm_status);

		static char* btif_get_default_local_name();

		@@ -1463,7 +1463,7 @@ static void btif_dm_search_services_evt(tBTA_DM_SEARCH_EVT event,
		}
		}

		void BTIF_dm_report_inquiry_status_change(uint8_t status) {
		void BTIF_dm_report_inquiry_status_change(tBTM_STATUS status) {
		if (status == BTM_INQUIRY_STARTED) {
		invoke_discovery_state_changed_cb(BT_DISCOVERY_STARTED);
		btif_dm_inquiry_in_progress = true;
		@@ -1817,7 +1817,7 @@ static void bta_energy_info_cb(tBTM_BLE_TX_TIME_MS tx_time,
		/* Scan filter param config event */
		static void bte_scan_filt_param_cfg_evt(uint8_t ref_value, uint8_t avbl_space,
		uint8_t action_type,
		uint8_t btm_status) {
		tBTM_STATUS btm_status) {
		/* This event occurs on calling BTA_DmBleCfgFilterCondition internally,
		** and that is why there is no HAL callback
		*/
		@@ -2423,7 +2423,7 @@ static void get_address_callback(tBT_TRANSPORT transport, bool is_valid,
		// Step Three: CallBack from Step Two, advertise and get address
		static void start_advertising_callback(uint8_t id, tBT_TRANSPORT transport,
		bool is_valid, const Octet16& c,
		const Octet16& r, uint8_t status) {
		const Octet16& r, tBTM_STATUS status) {
		if (status != 0) {
		LOG_INFO("OOB get advertiser ID failed with status %hhd", status);
		invoke_oob_data_request_cb(transport, false, c, r, RawAddress{}, 0x00);
		@@ -2438,7 +2438,7 @@ static void start_advertising_callback(uint8_t id, tBT_TRANSPORT transport,
		id, base::Bind(&get_address_callback, transport, is_valid, c, r));
		}

		static void timeout_cb(uint8_t id, uint8_t status) {
		static void timeout_cb(uint8_t id, tBTM_STATUS status) {
		LOG_INFO("OOB advertiser with id %hhd timed out with status %hhd", id,
		status);
		auto advertiser = get_ble_advertiser_instance();
		@@ -2451,7 +2451,7 @@ static void timeout_cb(uint8_t id, uint8_t status) {
		// Step Two: CallBack from Step One, advertise and get address
		static void id_status_callback(tBT_TRANSPORT transport, bool is_valid,
		const Octet16& c, const Octet16& r, uint8_t id,
		uint8_t status) {
		tBTM_STATUS status) {
		if (status != 0) {
		LOG_INFO("OOB get advertiser ID failed with status %hhd", status);
		invoke_oob_data_request_cb(transport, false, c, r, RawAddress{}, 0x00);

system/stack/include/btm_ble_api_types.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -431,16 +431,16 @@ typedef uint8_t tBTM_BLE_SCAN_COND_OP;
		/* BLE adv payload filtering config complete callback */
		using tBTM_BLE_PF_CFG_CBACK = base::Callback<void(
		uint8_t /* avbl_space /, tBTM_BLE_SCAN_COND_OP / action */,
		uint8_t /* btm_status */)>;
		tBTM_STATUS /* btm_status */)>;

		/* BLE adv payload filtering status setup complete callback */
		using tBTM_BLE_PF_STATUS_CBACK = base::Callback<void(
		tBTM_BLE_SCAN_COND_OP /action/, uint8_t /* btm_status */)>;
		tBTM_BLE_SCAN_COND_OP /action/, tBTM_STATUS /* btm_status */)>;

		/* BLE adv payload filtering param setup complete callback */
		using tBTM_BLE_PF_PARAM_CB = base::Callback<void(
		uint8_t /* avbl_space /, tBTM_BLE_SCAN_COND_OP / action */,
		uint8_t /* btm_status */)>;
		tBTM_STATUS /* btm_status */)>;

		#ifndef BTM_CS_IRK_LIST_MAX
		#define BTM_CS_IRK_LIST_MAX 0x20