Merge "[Invisalign2] Cleanup the comments and headers in btm_dev" into main (2c08d675) · Commits · e / os / android_packages_modules_Bluetooth

system/stack/btm/btm_dev.cc

+7 −6

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@
		#include <string>

		#include "btm_api.h"
		#include "btm_ble_int.h"
		#include "btm_int_types.h"
		#include "btm_sec_api.h"
		#include "btm_sec_cb.h"
		#include "device/include/controller.h"
		@@ -427,7 +427,7 @@ tBTM_SEC_DEV_REC* btm_find_dev_with_lenc(const RawAddress& bd_addr) {
		/*******************************************************************************
		*
		* Function btm_consolidate_dev
		5**
		*
		* Description combine security records if identified as same peer
		*
		* Returns none
		@@ -554,7 +554,8 @@ void btm_dev_consolidate_existing_connections(const RawAddress& bd_addr) {
		* Function btm_find_or_alloc_dev
		*
		* Description Look for the record in the device database for the record
		* with specified BD address
		* with specified BD address, if not found, allocate a new
		* record
		*
		* Returns Pointer to the record or NULL
		*
		@@ -574,7 +575,7 @@ tBTM_SEC_DEV_REC* btm_find_or_alloc_dev(const RawAddress& bd_addr) {
		*
		* Function btm_find_oldest_dev_rec
		*
		* Description Locates the oldest device in use. It first looks for
		* Description Locates the oldest device record in use. It first looks for
		* the oldest non-paired device. If all devices are paired it
		* returns the oldest paired device.
		*
		@@ -691,9 +692,9 @@ bool btm_set_bond_type_dev(const RawAddress& bd_addr,
		*
		* Function btm_get_sec_dev_rec
		*
		* Description Get security device records satisfying given filter
		* Description Get all security device records
		*
		* Returns A vector containing pointers of security device records
		* Returns A vector containing pointers to all security device records
		*
		******************************************************************************/
		std::vector<tBTM_SEC_DEV_REC*> btm_get_sec_dev_rec() {

system/stack/btm/btm_dev.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ const char* BTM_SecReadDevName(const RawAddress& bd_addr);
		*
		* Function btm_sec_alloc_dev
		*
		* Description Look for the record in the device database for the record
		* Description Allocate a record in the device database
		* with specified address
		*
		* Returns Pointer to the record or NULL