Merge "Remove unused API" (2e9b0fec) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_sec.cc

+0 −24

Original line number	Diff line number	Diff line
		@@ -84,8 +84,6 @@ static void btm_sec_bond_cancel_complete(void);
		static void btm_send_link_key_notif(tBTM_SEC_DEV_REC* p_dev_rec);
		static bool btm_sec_check_prefetch_pin(tBTM_SEC_DEV_REC* p_dev_rec);

		bool btm_sec_are_all_trusted(uint32_t p_mask[]);

		static tBTM_STATUS btm_sec_send_hci_disconnect(tBTM_SEC_DEV_REC* p_dev_rec,
		uint8_t reason,
		uint16_t conn_handle);
		@@ -4926,28 +4924,6 @@ static bool btm_sec_check_prefetch_pin(tBTM_SEC_DEV_REC* p_dev_rec) {
		return rv;
		}

		/*******************************************************************************
		*
		* Function btm_sec_auth_payload_tout
		*
		* Description Processes the HCI Autheniticated Payload Timeout Event
		* indicating that a packet containing a valid MIC on the
		* connection handle was not received within the programmed
		* timeout value. (Spec Default is 30 secs, but can be
		* changed via the BTM_SecSetAuthPayloadTimeout() function.
		*
		******************************************************************************/
		void btm_sec_auth_payload_tout(uint8_t* p, uint16_t hci_evt_len) {
		uint16_t handle;

		STREAM_TO_UINT16(handle, p);
		handle = HCID_GET_HANDLE(handle);

		/* Will be exposed to upper layers in the future if/when determined necessary
		*/
		BTM_TRACE_ERROR("%s on handle 0x%02x", __func__, handle);
		}

		/*******************************************************************************
		*
		* Function btm_sec_queue_encrypt_request

system/stack/btm/btm_sec.h

+0 −40

Original line number	Diff line number	Diff line
		@@ -113,22 +113,6 @@ bool BTM_IsAuthenticated(const RawAddress& bd_addr, tBT_TRANSPORT transport);
		******************************************************************************/
		void BTM_SetPinType(uint8_t pin_type, PIN_CODE pin_code, uint8_t pin_code_len);

		/*******************************************************************************
		*
		* Function BTM_SetPairableMode
		*
		* Description Enable or disable pairing
		*
		* Parameters allow_pairing - (true or false) whether or not the device
		* allows pairing.
		* connect_only_paired - (true or false) whether or not to
		* only allow paired devices to connect.
		*
		* Returns void
		*
		******************************************************************************/
		void BTM_SetPairableMode(bool allow_pairing, bool connect_only_paired);

		#define BTM_NO_AVAIL_SEC_SERVICES ((uint16_t)0xffff)

		/*******************************************************************************
		@@ -732,17 +716,6 @@ void btm_sec_update_clock_offset(uint16_t handle, uint16_t clock_offset);
		******************************************************************************/
		tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);

		/*******************************************************************************
		*
		* Function btm_sec_are_all_trusted
		*
		* Description This function is called check if all services are trusted
		*
		* Returns true if all are trusted, otherwise false
		*
		******************************************************************************/
		bool btm_sec_are_all_trusted(uint32_t p_mask[]);

		/*******************************************************************************
		*
		* Function btm_sec_find_first_serv
		@@ -782,19 +755,6 @@ tBTM_SEC_DEV_REC* btm_sec_find_dev_by_sec_state(uint8_t state);
		void btm_sec_dev_rec_cback_event(tBTM_SEC_DEV_REC* p_dev_rec, uint8_t res,
		bool is_le_transport);

		/*******************************************************************************
		*
		* Function btm_sec_auth_payload_tout
		*
		* Description Processes the HCI Autheniticated Payload Timeout Event
		* indicating that a packet containing a valid MIC on the
		* connection handle was not received within the programmed
		* timeout value. (Spec Default is 30 secs, but can be
		* changed via the BTM_SecSetAuthPayloadTimeout() function.
		*
		******************************************************************************/
		void btm_sec_auth_payload_tout(uint8_t* p, uint16_t hci_evt_len);

		/*******************************************************************************
		*
		* Function btm_sec_clear_ble_keys