Merge "legacy: Const-ify inquiry results APIs" (7869b4ba) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/include/bta_api.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -421,7 +421,7 @@ typedef struct {
		* request */
		bool is_limited; /* true, if the limited inquiry bit is set in the CoD */
		int8_t rssi; /* The rssi value */
		uint8_t* p_eir; /* received EIR */
		const uint8_t* p_eir; /* received EIR */
		uint16_t eir_len; /* received EIR length */
		uint8_t inq_result_type;
		tBLE_ADDR_TYPE ble_addr_type;

system/main/shim/btm_api.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda);
		extern void btm_acl_update_inquiry_status(uint8_t status);
		extern void btm_clear_all_pending_le_entry(void);
		extern void btm_clr_inq_result_flt(void);
		extern void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
		extern void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
		extern void btm_sort_inq_result(void);
		extern void btm_process_inq_complete(uint8_t status, uint8_t result_type);

system/stack/btm/btm_inq.cc

+5 −5

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ static tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda,
		tBTM_CMPL_CB* p_cb);

		static uint8_t btm_convert_uuid_to_eir_service(uint16_t uuid16);
		void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
		void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results);
		static const uint8_t* btm_eir_get_uuid_list(const uint8_t* p_eir,
		size_t eir_len, uint8_t uuid_size,
		uint8_t* p_num_uuid,
		@@ -1036,7 +1036,7 @@ tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda) {
		* Returns void
		*
		******************************************************************************/
		void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
		void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
		uint8_t inq_res_mode) {
		uint8_t num_resp, xx;
		RawAddress bda;
		@@ -1053,7 +1053,7 @@ void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
		uint8_t rssi = 0;
		DEV_CLASS dc;
		uint16_t clock_offset;
		uint8_t* p_eir_data = NULL;
		const uint8_t* p_eir_data = NULL;

		#if (BTM_INQ_DEBUG == TRUE)
		BTM_TRACE_DEBUG("btm_process_inq_results inq_active:0x%x state:%d",
		@@ -1400,7 +1400,7 @@ tBTM_STATUS btm_initiate_rem_name(const RawAddress& remote_bda, uint8_t origin,
		* Returns void
		*
		******************************************************************************/
		void btm_process_remote_name(const RawAddress* bda, BD_NAME bdn,
		void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn,
		uint16_t evt_len, uint8_t hci_status) {
		tBTM_REMOTE_DEV_NAME rem_name;
		tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;
		@@ -1860,7 +1860,7 @@ static uint16_t btm_convert_uuid_to_uuid16(const uint8_t* p_uuid,
		* Returns None
		*
		******************************************************************************/
		void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
		void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
		const uint8_t* p_uuid_data;
		uint8_t num_uuid;
		uint16_t uuid16;

system/stack/include/inq_hci_link_interface.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,10 +23,10 @@

		#include "types/raw_address.h"

		extern void btm_process_remote_name(const RawAddress* bda, BD_NAME name,
		extern void btm_process_remote_name(const RawAddress* bda, const BD_NAME name,
		uint16_t evt_len, uint8_t hci_status);

		extern void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
		extern void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
		uint8_t inq_res_mode);

		extern void btm_process_inq_complete(uint8_t status, uint8_t mode);

system/test/mock/mock_stack_btm_inq.cc

+3 −3

Original line number	Diff line number	Diff line
		@@ -172,15 +172,15 @@ void btm_process_cancel_complete(uint8_t status, uint8_t mode) {
		void btm_process_inq_complete(uint8_t status, uint8_t mode) {
		mock_function_count_map[__func__]++;
		}
		void btm_process_inq_results(uint8_t* p, uint8_t hci_evt_len,
		void btm_process_inq_results(const uint8_t* p, uint8_t hci_evt_len,
		uint8_t inq_res_mode) {
		mock_function_count_map[__func__]++;
		}
		void btm_process_remote_name(const RawAddress* bda, BD_NAME bdn,
		void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn,
		uint16_t evt_len, uint8_t hci_status) {
		mock_function_count_map[__func__]++;
		}
		void btm_set_eir_uuid(uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
		void btm_set_eir_uuid(const uint8_t* p_eir, tBTM_INQ_RESULTS* p_results) {
		mock_function_count_map[__func__]++;
		}
		void btm_sort_inq_result(void) { mock_function_count_map[__func__]++; }