diff --git a/system/bta/ag/bta_ag_cmd.cc b/system/bta/ag/bta_ag_cmd.cc
index faa7de62a7208e7a66a95ed9e928365a1bd8c164..dbbd460f8082fd93585a701c15cb12635770bd83 100644
--- a/system/bta/ag/bta_ag_cmd.cc
+++ b/system/bta/ag/bta_ag_cmd.cc
@@ -499,8 +499,7 @@ static tBTA_AG_PEER_CODEC bta_ag_parse_bac(tBTA_AG_SCB* p_scb, char* p_s) {
  * Function         bta_ag_process_unat_res
  *
  * Description      Process the unat response data and remove extra carriage
- *return
- *                  and line feed
+ *                  return and line feed
  *
  *
  * Returns          void
diff --git a/system/bta/ag/bta_ag_sco.cc b/system/bta/ag/bta_ag_sco.cc
index 9fa81ea36405f0f5c892de7a11ffc27a0b61944d..5ff5900a8f4e5d7d2fa15e82eded6cdf50bb7d88 100644
--- a/system/bta/ag/bta_ag_sco.cc
+++ b/system/bta/ag/bta_ag_sco.cc
@@ -284,7 +284,7 @@ static void bta_ag_sco_read_cback(uint16_t sco_inx, BT_HDR* p_data,
  *
  * Description      Removes the specified SCO from the system.
  *                  If only_active is true, then SCO is only removed if
- *connected
+ *                  connected
  *
  * Returns          bool   - true if Sco removal was started
  *
@@ -583,7 +583,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {
  * Function         bta_ag_attempt_msbc_safe_settings
  *
  * Description    Checks if ESCO connection needs to be attempted using mSBC
- *T1(safe) settings
+ *                T1(safe) settings
  *
  *
  * Returns          true if T1 settings has to be used, false otherwise
@@ -1227,7 +1227,7 @@ bool bta_ag_sco_is_open(tBTA_AG_SCB* p_scb) {
  *
  *
  * Returns          true if sco is in Opening state for this scb, false
- *otherwise.
+ *                  otherwise.
  *
  ******************************************************************************/
 bool bta_ag_sco_is_opening(tBTA_AG_SCB* p_scb) {
diff --git a/system/bta/ar/bta_ar.cc b/system/bta/ar/bta_ar.cc
index c3ef92afa74da2e629f4ae128eeaf84d66152387..f5aeeca897a14d5e582f8836947260e349501a93 100644
--- a/system/bta/ar/bta_ar.cc
+++ b/system/bta/ar/bta_ar.cc
@@ -146,8 +146,7 @@ void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id) {
  * Function         bta_ar_avdt_conn
  *
  * Description      This function is called to let ar know that some AVDTP
- *profile
- *                  is connected for this sys_id.
+ *                  profile is connected for this sys_id.
  *                  If the other sys modules started a timer for PENDING_EVT,
  *                  the timer can be stopped now.
  *
@@ -262,7 +261,7 @@ void bta_ar_reg_avrc(uint16_t service_uuid, const char* service_name,
  * Function         bta_ar_dereg_avrc
  *
  * Description      This function is called to de-register/delete an SDP record
- *for AVRCP.
+ *                  for AVRCP.
  *
  * Returns          void
  *
diff --git a/system/bta/av/bta_av_aact.cc b/system/bta/av/bta_av_aact.cc
index 1a2a239f768a5bbdbe4f4b538de16fe1326cd74c..2b9653416bca5a8cd99e111d641ccd491eb2b95f 100644
--- a/system/bta/av/bta_av_aact.cc
+++ b/system/bta/av/bta_av_aact.cc
@@ -2685,7 +2685,7 @@ void bta_av_rcfg_cfm(tBTA_AV_SCB* p_scb, tBTA_AV_DATA* p_data) {
  * Function         bta_av_rcfg_open
  *
  * Description      AVDT is connected. open the stream with the new
- *configuration
+ *                  configuration
  *
  * Returns          void
  *
@@ -2733,7 +2733,7 @@ void bta_av_security_rej(tBTA_AV_SCB* p_scb, UNUSED_ATTR tBTA_AV_DATA* p_data) {
  *
  * Description      check if this is 2nd stream and if it needs to be started.
  *                  This function needs to be kept very similar to
- *bta_av_chk_start
+ *                  bta_av_chk_start
  *
  * Returns          void
  *
diff --git a/system/bta/av/bta_av_act.cc b/system/bta/av/bta_av_act.cc
index 134e22f3c0ac5d36c9aa9bb9e048b4b9025d4779..535eab4abf5685e03d0541045c58b716915fe225 100644
--- a/system/bta/av/bta_av_act.cc
+++ b/system/bta/av/bta_av_act.cc
@@ -1604,8 +1604,7 @@ static void bta_av_accept_signalling_timer_cback(void* data) {
  * Function         bta_av_check_peer_features
  *
  * Description      check supported features on the peer device from the SDP
- *record
- *                  and return the feature mask
+ *                  record and return the feature mask
  *
  * Returns          tBTA_AV_FEAT peer device feature mask
  *
@@ -1670,8 +1669,7 @@ tBTA_AV_FEAT bta_av_check_peer_features(uint16_t service_uuid) {
  * Function         bta_avk_check_peer_features
  *
  * Description      check supported features on the peer device from the SDP
- *record
- *                  and return the feature mask
+ *                  record and return the feature mask
  *
  * Returns          tBTA_AV_FEAT peer device feature mask
  *
diff --git a/system/bta/av/bta_av_api.cc b/system/bta/av/bta_av_api.cc
index 782debec5e1ab3cf1c4bcbc85cb9796087ccc301..90a2decfe833197ff46d51c41a2ce80d15de2549 100644
--- a/system/bta/av/bta_av_api.cc
+++ b/system/bta/av/bta_av_api.cc
@@ -287,8 +287,7 @@ void BTA_AvStop(bool suspend) {
  *
  * Description      Reconfigure the audio/video stream.
  *                  If suspend is true, this function tries the
- *suspend/reconfigure
- *                  procedure first.
+ *                  suspend/reconfigure procedure first.
  *                  If suspend is false or when suspend/reconfigure fails,
  *                  this function closes and re-opens the AVDT connection.
  *
@@ -545,8 +544,8 @@ void BTA_AvCloseRc(uint8_t rc_handle) {
  * Function         BTA_AvMetaRsp
  *
  * Description      Send a Metadata/Advanced Control response. The message
- *contained
- *                  in p_pkt can be composed with AVRC utility functions.
+ *                  contained in p_pkt can be composed with AVRC utility
+ *                  functions.
  *                  This function can only be used if AV is enabled with feature
  *                  BTA_AV_FEAT_METADATA.
  *
diff --git a/system/bta/av/bta_av_main.cc b/system/bta/av/bta_av_main.cc
index 5d9745ae50b59c4a7068a33886aa435d4d492076..702e75987f8ce688e5694d00bbaa161f2e0956d1 100644
--- a/system/bta/av/bta_av_main.cc
+++ b/system/bta/av/bta_av_main.cc
@@ -671,8 +671,8 @@ void bta_av_api_deregister(tBTA_AV_DATA* p_data) {
  *
  * Function         bta_av_ci_data
  *
- * Description      forward the BTA_AV_CI_SRC_DATA_READY_EVT to stream state
- *machine
+ * Description      Forward the BTA_AV_CI_SRC_DATA_READY_EVT to stream state
+ *                  machine.
  *
  *
  * Returns          void
@@ -878,8 +878,7 @@ static void bta_av_sys_rs_cback(UNUSED_ATTR tBTA_SYS_CONN_STATUS status,
  *
  * Description      receive & process the SCO connection up/down event from sys.
  *                  call setup also triggers this callback, to suspend av before
- *sco
- *                  activity happens, or to resume av once call ends.
+ *                  SCO activity happens, or to resume av once call ends.
  *
  * Returns          void
  *
@@ -1055,7 +1054,7 @@ uint16_t bta_av_chk_mtu(tBTA_AV_SCB* p_scb, UNUSED_ATTR uint16_t mtu) {
  * Function         bta_av_dup_audio_buf
  *
  * Description      dup the audio data to the q_info.a2dp of other audio
- *channels
+ *                  channels
  *
  * Returns          void
  *
diff --git a/system/bta/dm/bta_dm_act.cc b/system/bta/dm/bta_dm_act.cc
index 109b9ab9a079dc0eb38a9551b2cc4f358425da08..b8357c81b345d5730c4b5794d6d36e9337aad19b 100644
--- a/system/bta/dm/bta_dm_act.cc
+++ b/system/bta/dm/bta_dm_act.cc
@@ -801,8 +801,7 @@ void bta_dm_remove_device(tBTA_DM_MSG* p_data) {
  *
  * Description      This function adds a Link Key to an security database entry.
  *                  It is normally called during host startup to restore all
- *required information
- *                  stored in the NVRAM.
+ *                  required information stored in the NVRAM.
  ***
  ******************************************************************************/
 void bta_dm_add_device(tBTA_DM_MSG* p_data) {
@@ -851,9 +850,8 @@ void bta_dm_add_device(tBTA_DM_MSG* p_data) {
  * Function         bta_dm_close_acl
  *
  * Description      This function forces to close the connection to a remote
- *device
- *                  and optionaly remove the device from security database if
- *                  required.
+ *                  device and optionaly remove the device from security
+ *                  database if required.
  ***
  ******************************************************************************/
 void bta_dm_close_acl(tBTA_DM_MSG* p_data) {
@@ -897,7 +895,7 @@ void bta_dm_close_acl(tBTA_DM_MSG* p_data) {
  * Function         bta_dm_remove_all_acl
  *
  * Description      This function forces to close all the ACL links specified by
- *link type
+ *                  link type
  ***
  ******************************************************************************/
 void bta_dm_remove_all_acl(tBTA_DM_MSG* p_data) {
@@ -1131,7 +1129,7 @@ void bta_dm_ci_io_req_act(tBTA_DM_MSG* p_data) {
  * Function         bta_dm_ci_rmt_oob_act
  *
  * Description      respond to the OOB data request for the remote device from
- *BTM
+ *                  BTM
  *
  *
  * Returns          void
@@ -1343,8 +1341,7 @@ static void bta_dm_di_disc_callback(uint16_t result) {
  * Function         bta_dm_disable_search_and_disc
  *
  * Description      Cancels an ongoing search or discovery for devices in case
- *of
- *                  a Bluetooth disable
+ *                  of a Bluetooth disable
  *
  *
  * Returns          void
@@ -1787,7 +1784,7 @@ void bta_dm_search_cmpl(tBTA_DM_MSG* p_data) {
  * Function         bta_dm_disc_result
  *
  * Description      Service discovery result when discovering services on a
- *device
+ *                  device
  *
  * Returns          void
  *
@@ -3463,8 +3460,7 @@ static void bta_dm_adjust_roles(bool delay_role_switch) {
  * Function         bta_dm_get_remname
  *
  * Description      Returns a pointer to the remote name stored in the DM
- *control
- *                  block if it exists, or from the BTM memory.
+ *                  control block if it exists, or from the BTM memory.
  *
  * Returns          char * - Pointer to the remote device name
  ******************************************************************************/
@@ -3533,7 +3529,7 @@ static size_t find_utf8_char_boundary(const char* utf8str, size_t offset) {
  * Function         bta_dm_set_eir
  *
  * Description      This function creates EIR tagged data and writes it to
- *controller.
+ *                  controller.
  *
  * Returns          None
  *
@@ -3917,7 +3913,7 @@ void bta_dm_disable_test_mode(UNUSED_ATTR tBTA_DM_MSG* p_data) {
  * Function         bta_dm_execute_callback
  *
  * Description      Just execute a generic call back in the context of the
- *BTU/BTA tack
+ *                  BTU/BTA tack
  *
  *
  * Returns          void
@@ -4250,10 +4246,9 @@ static void bta_dm_ble_id_key_cback(uint8_t key_type,
  *
  * Description      This function adds an BLE Key to an security database entry.
  *                  This function shall only be called AFTER BTA_DmAddBleDevice
- *has been called.
+ *                  has been called.
  *                  It is normally called during host startup to restore all
- *required information
- *                  stored in the NVRAM.
+ *                  required information stored in the NVRAM.
  *
  * Parameters:
  *
@@ -4277,10 +4272,9 @@ void bta_dm_add_blekey(tBTA_DM_MSG* p_data) {
  * Function         bta_dm_add_ble_device
  *
  * Description      This function adds an BLE device to an security database
- *entry.
+ *                  entry.
  *                  It is normally called during host startup to restore all
- *required information
- *                  stored in the NVRAM.
+ *                  required information stored in the NVRAM.
  *
  * Parameters:
  *
@@ -4304,10 +4298,9 @@ void bta_dm_add_ble_device(tBTA_DM_MSG* p_data) {
  * Function         bta_dm_add_ble_device
  *
  * Description      This function adds an BLE device to an security database
- *entry.
+ *                  entry.
  *                  It is normally called during host startup to restore all
- *required information
- *                  stored in the NVRAM.
+ *                  required information stored in the NVRAM.
  *
  * Parameters:
  *
@@ -4515,7 +4508,7 @@ void bta_dm_ble_set_data_length(tBTA_DM_MSG* p_data) {
  * Function         bta_dm_ble_setup_storage
  *
  * Description      This function configures up the storage parameters for ADV
- *batch scanning
+ *                  batch scanning
  *
  * Parameters:
  *
@@ -4657,7 +4650,7 @@ void bta_dm_ble_track_advertiser(tBTA_DM_MSG* p_data) {
  * Function         bta_ble_scan_setup_cb
  *
  * Description      Handle the setup callback from BTM layer and forward it to
- *app layer
+ *                  app layer
  *
  * Parameters:
  *
@@ -5055,8 +5048,7 @@ void bta_dm_close_gatt_conn(UNUSED_ATTR tBTA_DM_MSG* p_data) {
  * Function         btm_dm_start_gatt_discovery
  *
  * Description      This is GATT initiate the service search by open a GATT
- *connection
- *                  first.
+ *                  connection first.
  *
  * Parameters:
  *
diff --git a/system/bta/dm/bta_dm_api.cc b/system/bta/dm/bta_dm_api.cc
index c21647a3a3061eb4d96615f0a013b8ce1fe86dd0..6eada78b4d9a0e84422078ca68d33559d05eb4ce 100644
--- a/system/bta/dm/bta_dm_api.cc
+++ b/system/bta/dm/bta_dm_api.cc
@@ -160,7 +160,7 @@ void BTA_DmSetDeviceName(char* p_name) {
  *
  * Description      This function sets the Bluetooth connectable,
  *                  discoverable, pairable and conn paired only modes of local
- *device
+ *                  device
  *
  *
  * Returns          void
@@ -185,9 +185,8 @@ void BTA_DmSetVisibility(tBTA_DM_DISC disc_mode, tBTA_DM_CONN conn_mode,
  * Function         BTA_DmSearch
  *
  * Description      This function searches for peer Bluetooth devices. It
- *performs
- *                  an inquiry and gets the remote name for devices. Service
- *                  discovery is done if services is non zero
+ *                  performs an inquiry and gets the remote name for devices.
+ *                  Service discovery is done if services is non zero
  *
  *
  * Returns          void
@@ -463,8 +462,8 @@ void BTA_DmAddDevice(BD_ADDR bd_addr, DEV_CLASS dev_class, LINK_KEY link_key,
  * Function         BTA_DmRemoveDevice
  *
  * Description      This function removes a device fromthe security database
- *list of
- *                  peer device. It manages unpairing even while connected.
+ *                  list of peer device. It manages unpairing even while
+ *                  connected.
  *
  *
  * Returns          void
@@ -576,7 +575,7 @@ tBTA_STATUS BTA_DmSetLocalDiRecord(tBTA_DI_RECORD* p_device_info,
  * Function         bta_dmexecutecallback
  *
  * Description      This function will request BTA to execute a call back in the
- *context of BTU task
+ *                  context of BTU task.
  *                  This API was named in lower case because it is only intended
  *                  for the internal customers(like BTIF).
  *
@@ -693,7 +692,7 @@ void BTA_DmBlePasskeyReply(BD_ADDR bd_addr, bool accept, uint32_t passkey) {
  *
  * Parameters:      bd_addr          - BD address of the peer
  *                  accept           - numbers to compare are the same or
- *different.
+ *                                     different.
  *
  * Returns          void
  *
@@ -810,7 +809,7 @@ void BTA_DmSetBleConnScanParams(uint32_t scan_interval, uint32_t scan_window) {
  *                  scan_window - scan window
  *                  scan_mode - scan mode
  *                  scan_param_setup_status_cback - Set scan param status
- *callback
+ *                                                  callback
  *
  * Returns          void
  *
@@ -840,10 +839,9 @@ void BTA_DmSetBleScanParams(
  * Function         BTA_DmSetBleAdvParams
  *
  * Description      This function sets the advertising parameters BLE
- *functionality.
+ *                  functionality.
  *                  It is to be called when device act in peripheral or
- *broadcaster
- *                  role.
+ *                  broadcaster role.
  *
  *
  * Returns          void
@@ -878,11 +876,11 @@ void BTA_DmSetBleAdvParams(uint16_t adv_int_min, uint16_t adv_int_max,
  * Description      This function is called to override the BTA scan response.
  *
  * Parameters       batch_scan_full_max -Max storage space (in %) allocated to
- *full scanning
+ *                                       full scanning
  *                  batch_scan_trunc_max -Max storage space (in %) allocated to
- *truncated scanning
+ *                                        truncated scanning
  *                  batch_scan_notify_threshold -Setup notification level based
- *on total space
+ *                                               on total space
  *                  p_setup_cback - Setup callback pointer
  *                  p_thres_cback - Threshold callback pointer
  *                  p_rep_cback - Reports callback pointer
@@ -1037,10 +1035,9 @@ extern void BTA_DmBleTrackAdvertiser(
  *                  peripheral device.
  *
  * Parameters       bg_conn_type: it can be auto connection, or selective
- *connection.
+ *                                connection.
  *                  p_select_cback: callback function when selective connection
- *procedure
- *                              is being used.
+ *                                  procedure is being used.
  *
  * Returns          void
  *
@@ -1155,17 +1152,15 @@ void BTA_DmDiscoverExt(BD_ADDR bd_addr, tBTA_SERVICE_MASK_EXT* p_services,
  * Function         BTA_DmSearchExt
  *
  * Description      This function searches for peer Bluetooth devices. It
- *performs
- *                  an inquiry and gets the remote name for devices. Service
- *                  discovery is done if services is non zero
+ *                  performs an inquiry and gets the remote name for devices.
+ *                  Service discovery is done if services is non zero
  *
  * Parameters       p_dm_inq: inquiry conditions
  *                  p_services: if service is not empty, service discovery will
- *be done.
- *                            for all GATT based service condition, put
- *num_uuid, and
- *                            p_uuid is the pointer to the list of UUID values.
- *                  p_cback: callback functino when search is completed.
+ *                              be done. For all GATT based service conditions,
+ *                              put num_uuid, and p_uuid is the pointer to the
+ *                              list of UUID values.
+ *                  p_cback: callback function when search is completed.
  *
  *
  *
@@ -1210,13 +1205,13 @@ void BTA_DmSearchExt(UNUSED_ATTR tBTA_DM_INQ* p_dm_inq,
  * Function         BTA_DmBleUpdateConnectionParam
  *
  * Description      Update connection parameters, can only be used when
- *connection is up.
+ *                  connection is up.
  *
  * Parameters:      bd_addr          - BD address of the peer
- *                  min_int   -     minimum connection interval, [0x0004~
- *0x4000]
- *                  max_int   -     maximum connection interval, [0x0004~
- *0x4000]
+ *                  min_int   -     minimum connection interval,
+ *                                  [0x0004 ~ 0x4000]
+ *                  max_int   -     maximum connection interval,
+ *                                  [0x0004 ~ 0x4000]
  *                  latency   -     slave latency [0 ~ 500]
  *                  timeout   -     supervision timeout [0x000a ~ 0xc80]
  *
@@ -1273,8 +1268,7 @@ void BTA_DmBleConfigLocalPrivacy(bool privacy_enable) {
  * Function         BTA_DmBleCfgFilterCondition
  *
  * Description      This function is called to configure the adv data payload
- *filter
- *                  condition.
+ *                  filter condition.
  *
  * Parameters       action: to read/write/clear
  *                  cond_type: filter condition type
@@ -1395,10 +1389,10 @@ void BTA_DmBleCfgFilterCondition(
  * Function         BTA_DmBleScanFilterSetup
  *
  * Description      This function is called to setup the adv data payload filter
- *param
+ *                  param
  *
  * Parameters       p_target: enable the filter condition on a target device; if
- *NULL
+ *                            NULL
  *                  filt_index - Filter index
  *                  p_filt_params -Filter parameters
  *                  ref_value - Reference value
@@ -1478,7 +1472,7 @@ void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK* p_cmpl_cback) {
  * Function         BTA_DmEnableScanFilter
  *
  * Description      This function is called to enable the adv data payload
- *filter
+ *                  filter
  *
  * Parameters       action - enable or disable the APCF feature
  *                  p_cmpl_cback - Command completed callback
@@ -1517,13 +1511,13 @@ void BTA_DmEnableScanFilter(
  * Function         BTA_DmBleUpdateConnectionParams
  *
  * Description      Update connection parameters, can only be used when
- *connection is up.
+ *                  connection is up.
  *
  * Parameters:      bd_addr   - BD address of the peer
- *                  min_int   -     minimum connection interval, [0x0004~
- *0x4000]
- *                  max_int   -     maximum connection interval, [0x0004~
- *0x4000]
+ *                  min_int   -     minimum connection interval,
+ *                                  [0x0004 ~ 0x4000]
+ *                  max_int   -     maximum connection interval,
+ *                                  [0x0004 ~ 0x4000]
  *                  latency   -     slave latency [0 ~ 500]
  *                  timeout   -     supervision timeout [0x000a ~ 0xc80]
  *
@@ -1585,12 +1579,10 @@ void BTA_DmBleSetDataLength(BD_ADDR remote_device, uint16_t tx_data_length) {
  *                  p_callback    - Pointer to callback function to indicat the
  *                                  link encryption status
  *                  sec_act       - This is the security action to indicate
- *                                  what knid of BLE security level is required
- *for
- *                                  the BLE link if the BLE is supported
+ *                                  what kind of BLE security level is required
+ *                                  for the BLE link if BLE is supported.
  *                                  Note: This parameter is ignored for the
- *BR/EDR link
- *                                        or the BLE is not supported
+ *                                        BR/EDR or if BLE is not supported.
  *
  * Returns          void
  *
@@ -1617,8 +1609,7 @@ void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport,
  * Function         BTA_DmCloseACL
  *
  * Description      This function force to close an ACL connection and remove
- *the
- *                  device from the security database list of known devices.
+ *                  the device from the security database list of known devices.
  *
  * Parameters:      bd_addr       - Address of the peer device
  *                  remove_dev    - remove device or not after link down
@@ -1688,7 +1679,7 @@ void BTA_VendorInit(void) { APPL_TRACE_API("BTA_VendorInit"); }
  * Function         BTA_VendorCleanup
  *
  * Description      This function frees up Broadcom specific VS specific dynamic
- *memory
+ *                  memory
  *
  * Returns          void
  *
diff --git a/system/bta/dm/bta_dm_pm.cc b/system/bta/dm/bta_dm_pm.cc
index 646d03f7ce831c8974f26ac71b7b1270713102fe..6f64bc2fd14a7ddbc676bcc4740dcef61c63debe 100644
--- a/system/bta/dm/bta_dm_pm.cc
+++ b/system/bta/dm/bta_dm_pm.cc
@@ -177,7 +177,7 @@ static void bta_dm_pm_stop_timer(BD_ADDR peer_addr) {
  * Function         bta_pm_action_to_timer_idx
  *
  * Description      convert power mode into timer index for each connected
- *device
+ *                  device
  *
  *
  * Returns          index of the power mode delay timer
@@ -1153,7 +1153,7 @@ static void bta_dm_pm_set_sniff_policy(tBTA_DM_PEER_DEVICE* p_dev,
  * Function         bta_dm_pm_obtain_controller_state
  *
  * Description      This function obtains the consolidated controller power
- *state
+ *                  state
  *
  * Parameters:
  *
diff --git a/system/bta/dm/bta_dm_sco.cc b/system/bta/dm/bta_dm_sco.cc
index 107c175f9e2f6ba572bb287d4dbf9998963623d0..094906f50497730159a5a1a25f0ab6ec626ba403 100644
--- a/system/bta/dm/bta_dm_sco.cc
+++ b/system/bta/dm/bta_dm_sco.cc
@@ -629,15 +629,13 @@ void BTA_DmPcmInitSamples(uint32_t src_sps, uint32_t bits,
  * Function         BTA_DmPcmResample
  *
  * Description      Down sampling utility to convert higher sampling rate into
- *8K/16bits
- *                  PCM samples.
+ *                  8K/16bits PCM samples.
  *
  * Parameters       p_src: pointer to the buffer where the original sampling PCM
  *                              are stored.
  *                  in_bytes:  Length of the input PCM sample buffer in byte.
  *                  p_dst:      pointer to the buffer which is to be used to
- *store
- *                              the converted PCM samples.
+ *                              store the converted PCM samples.
  *
  *
  * Returns          int32_t: number of samples converted.
diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc
index fc660702cd301a52ad780b23032bd052bca0faf3..7895cf2757ec9d5af27e45270dd3c998b23ca4b7 100644
--- a/system/bta/gatt/bta_gattc_act.cc
+++ b/system/bta/gatt/bta_gattc_act.cc
@@ -778,8 +778,7 @@ void bta_gattc_set_discover_st(tBTA_GATTC_SERV* p_srcb) {
  *
  * Description      process service change in discovery state, mark up the auto
  *                  update flag and set status to be discovery cancel for
- *current
- *                  discovery.
+ *                  current discovery.
  *
  * Returns          None.
  *
@@ -1279,8 +1278,7 @@ void bta_gattc_search(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) {
  * Function         bta_gattc_q_cmd
  *
  * Description      enqueue a command into control block, usually because
- *discovery
- *                  operation is busy.
+ *                  discovery operation is busy.
  *
  * Returns          None.
  *
@@ -1416,8 +1414,7 @@ static void bta_gattc_enc_cmpl_cback(tGATT_IF gattc_if, BD_ADDR bda) {
  * Function         bta_gattc_process_api_refresh
  *
  * Description      process refresh API to delete cache and start a new
- *discovery
- *                  if currently connected.
+ *                  discovery if currently connected.
  *
  * Returns          None.
  *
diff --git a/system/bta/gatt/bta_gattc_api.cc b/system/bta/gatt/bta_gattc_api.cc
index f29090528bca742bb4ca81755158550125b1309a..0f1d8c6562aa1f97bae21b807dcaaee9e430ff6f 100644
--- a/system/bta/gatt/bta_gattc_api.cc
+++ b/system/bta/gatt/bta_gattc_api.cc
@@ -127,7 +127,7 @@ void BTA_GATTC_AppDeregister(tBTA_GATTC_IF client_if) {
  *                  remote_bda: remote device BD address.
  *                  is_direct: direct connection or background auto connection
  *                  transport: Transport to be used for GATT connection
- *(BREDR/LE)
+ *                             (BREDR/LE)
  *
  * Returns          void
  *
@@ -151,7 +151,7 @@ void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, bool is_direct,
  * Function         BTA_GATTC_CancelOpen
  *
  * Description      Cancel a direct open connection or remove a background auto
- *connection
+ *                  connection
  *                  bd address
  *
  * Parameters       client_if: server interface.
@@ -223,15 +223,13 @@ void BTA_GATTC_ConfigureMTU(uint16_t conn_id, uint16_t mtu) {
  * Function         BTA_GATTC_ServiceSearchRequest
  *
  * Description      This function is called to request a GATT service discovery
- *                    on a GATT server. This function report service search
- *result
- *                  by a callback event, and followed by a service search
- *complete
- *                  event.
+ *                  on a GATT server. This function report service search
+ *                  result by a callback event, and followed by a service search
+ *                  complete event.
  *
  * Parameters       conn_id: connection ID.
  *                  p_srvc_uuid: a UUID of the service application is interested
- *in.
+ *                               in.
  *                              If Null, discover for all services.
  *
  * Returns          None
@@ -258,7 +256,7 @@ void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id, tBT_UUID* p_srvc_uuid) {
  * Function         BTA_GATTC_GetServices
  *
  * Description      This function is called to find the services on the given
- *server.
+ *                  server.
  *
  * Parameters       conn_id: connection ID which identify the server.
  *
@@ -274,7 +272,7 @@ const list_t* BTA_GATTC_GetServices(uint16_t conn_id) {
  * Function         BTA_GATTC_GetCharacteristic
  *
  * Description      This function is called to find the characteristic on the
- *given server.
+ *                  given server.
  *
  * Parameters       conn_id - connection ID which identify the server.
  *                  handle - characteristic handle
@@ -292,7 +290,7 @@ const tBTA_GATTC_CHARACTERISTIC* BTA_GATTC_GetCharacteristic(uint16_t conn_id,
  * Function         BTA_GATTC_GetDescriptor
  *
  * Description      This function is called to find the characteristic on the
- *given server.
+ *                  given server.
  *
  * Parameters       conn_id - connection ID which identify the server.
  *                  handle - descriptor handle
@@ -313,8 +311,7 @@ const tBTA_GATTC_DESCRIPTOR* BTA_GATTC_GetDescriptor(uint16_t conn_id,
  *
  * Parameters       conn_id: connection ID which identify the server.
  *                  db: output parameter which will contain the GATT database
- *copy.
- *                      Caller is responsible for freeing it.
+ *                      copy. Caller is responsible for freeing it.
  *                  count: number of elements in database.
  *
  ******************************************************************************/
@@ -491,7 +488,7 @@ void BTA_GATTC_WriteCharDescr(uint16_t conn_id, uint16_t handle,
  * Function         BTA_GATTC_PrepareWrite
  *
  * Description      This function is called to prepare write a characteristic
- *value.
+ *                  value.
  *
  * Parameters       conn_id - connection ID.
  *                  p_char_id - GATT characteritic ID of the service.
@@ -532,7 +529,7 @@ void BTA_GATTC_PrepareWrite(uint16_t conn_id, uint16_t handle, uint16_t offset,
  * Function         BTA_GATTC_ExecuteWrite
  *
  * Description      This function is called to execute write a prepare write
- *sequence.
+ *                  sequence.
  *
  * Parameters       conn_id - connection ID.
  *                    is_execute - execute or cancel.
@@ -581,7 +578,7 @@ void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t handle) {
  * Function         BTA_GATTC_RegisterForNotifications
  *
  * Description      This function is called to register for notification of a
- *service.
+ *                  service.
  *
  * Parameters       client_if - client interface.
  *                  bda - target GATT server.
@@ -643,7 +640,7 @@ tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications(tBTA_GATTC_IF client_if,
  * Function         BTA_GATTC_DeregisterForNotifications
  *
  * Description      This function is called to de-register for notification of a
- *servbice.
+ *                  service.
  *
  * Parameters       client_if - client interface.
  *                  remote_bda - target GATT server.
diff --git a/system/bta/gatt/bta_gattc_cache.cc b/system/bta/gatt/bta_gattc_cache.cc
index 31280c53112d75120e33f054b4a9c532217f6783..76d02006605f96649a5db7fc8ef55c953ae4e636 100644
--- a/system/bta/gatt/bta_gattc_cache.cc
+++ b/system/bta/gatt/bta_gattc_cache.cc
@@ -156,7 +156,7 @@ static void bta_gattc_display_explore_record(tBTA_GATTC_ATTR_REC* p_rec,
  * Function         bta_gattc_init_cache
  *
  * Description      Initialize the database cache and discovery related
- *resources.
+ *                  resources.
  *
  * Returns          status
  *
@@ -1481,8 +1481,7 @@ done:
  * Function         bta_gattc_cache_write
  *
  * Description      This callout function is executed by GATT when a server
- *cache
- *                  is available to save.
+ *                  cache is available to save.
  *
  * Parameter        server_bda: server bd address of this cache belongs to
  *                  num_attr: number of attribute to be save.
diff --git a/system/bta/gatt/bta_gattc_main.cc b/system/bta/gatt/bta_gattc_main.cc
index 667b78a7710afee9d9c1a219e0b3a01ab13597fd..b175a2da7735f64b81b15e1d4e5b874fe8666157 100644
--- a/system/bta/gatt/bta_gattc_main.cc
+++ b/system/bta/gatt/bta_gattc_main.cc
@@ -300,8 +300,7 @@ static char* gattc_state_code(tBTA_GATTC_STATE state_code);
  *
  *
  * Returns          bool  : true if queued client request buffer can be
- *immediately released
- *                                        else false
+ *                          immediately released, else false
  *
  ******************************************************************************/
 bool bta_gattc_sm_execute(tBTA_GATTC_CLCB* p_clcb, uint16_t event,
diff --git a/system/bta/gatt/bta_gattc_utils.cc b/system/bta/gatt/bta_gattc_utils.cc
index b575af8b42aec533b4e14e39a9a6188b07a03fc8..1762a9813766d2ac7850a71b7f192a2580d66585 100644
--- a/system/bta/gatt/bta_gattc_utils.cc
+++ b/system/bta/gatt/bta_gattc_utils.cc
@@ -426,7 +426,7 @@ bool bta_gattc_check_notif_registry(tBTA_GATTC_RCB* p_clreg,
  * Function         bta_gattc_clear_notif_registration
  *
  * Description      Clear up the notification registration information by
- *BD_ADDR.
+ *                  BD_ADDR.
  *                  Where handle is between start_handle and end_handle, and
  *                  start_handle and end_handle are boundaries of service
  *                  containing characteristic.
@@ -470,8 +470,7 @@ void bta_gattc_clear_notif_registration(tBTA_GATTC_SERV* p_srcb,
  * Function         bta_gattc_mark_bg_conn
  *
  * Description      mark background connection status when a bg connection is
- *initiated
- *                  or terminated.
+ *                  initiated or terminated.
  *
  * Returns          true if success; false otherwise.
  *
@@ -539,7 +538,7 @@ bool bta_gattc_mark_bg_conn(tBTA_GATTC_IF client_if, BD_ADDR_PTR remote_bda_ptr,
  * Function         bta_gattc_check_bg_conn
  *
  * Description      check if this is a background connection background
- *connection.
+ *                  connection.
  *
  * Returns          true if success; false otherwise.
  *
@@ -682,7 +681,7 @@ bool bta_gattc_conn_dealloc(BD_ADDR remote_bda) {
  * Function         bta_gattc_find_int_conn_clcb
  *
  * Description      try to locate a clcb when an internal connecion event
- *arrives.
+ *                  arrives.
  *
  * Returns          pointer to the clcb
  *
@@ -716,7 +715,7 @@ tBTA_GATTC_CLCB* bta_gattc_find_int_conn_clcb(tBTA_GATTC_DATA* p_msg) {
  * Function         bta_gattc_find_int_disconn_clcb
  *
  * Description      try to locate a clcb when an internal disconnect callback
- *arrives.
+ *                  arrives.
  *
  * Returns          pointer to the clcb
  *
diff --git a/system/bta/gatt/bta_gatts_act.cc b/system/bta/gatt/bta_gatts_act.cc
index 61179bcf4ada4645c01380ac9b6aaeb38e2ff140..8b04955b359ecadd44967f8e41247460c056260e 100644
--- a/system/bta/gatt/bta_gatts_act.cc
+++ b/system/bta/gatt/bta_gatts_act.cc
@@ -66,7 +66,7 @@ tGATT_APPL_INFO bta_gatts_nv_cback = {bta_gatts_nv_save_cback,
  * Description      NV save callback function.
  *
  * Parameter        is_add: true is to add a handle range; otherwise is to
- *delete.
+ *                          delete.
  * Returns          none.
  *
  ******************************************************************************/
@@ -83,7 +83,7 @@ static void bta_gatts_nv_save_cback(bool is_add,
  * Description      NV save callback function.
  *
  * Parameter        is_add: true is to add a handle range; otherwise is to
- *delete.
+ *                          delete.
  * Returns          none.
  *
  ******************************************************************************/
diff --git a/system/bta/gatt/bta_gatts_api.cc b/system/bta/gatt/bta_gatts_api.cc
index e6f9d04cb22e3fb39c83f70e861bd4e7dbc83191..a56ec4e6cf3023006db1d2fa2df3dbc44cfa8708 100644
--- a/system/bta/gatt/bta_gatts_api.cc
+++ b/system/bta/gatt/bta_gatts_api.cc
@@ -165,9 +165,8 @@ extern uint16_t BTA_GATTS_AddService(tBTA_GATTS_IF server_if,
  * Function         BTA_GATTS_DeleteService
  *
  * Description      This function is called to delete a service. When this is
- *done,
- *                  a callback event BTA_GATTS_DELETE_EVT is report with the
- *status.
+ *                  done, a callback event BTA_GATTS_DELETE_EVT is report with
+ *                  the status.
  *
  * Parameters       service_id: service_id to be deleted.
  *
@@ -208,13 +207,13 @@ void BTA_GATTS_StopService(uint16_t service_id) {
  * Function         BTA_GATTS_HandleValueIndication
  *
  * Description      This function is called to read a characteristics
- *descriptor.
+ *                  descriptor.
  *
  * Parameters       bda - remote device bd address to indicate.
  *                  attr_id - attribute ID to indicate.
  *                  value - data to indicate.
  *                  need_confirm - if this indication expects a confirmation or
- *not.
+ *                                 not.
  *
  * Returns          None
  *
@@ -273,14 +272,13 @@ void BTA_GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id,
  * Function         BTA_GATTS_Open
  *
  * Description      Open a direct open connection or add a background auto
- *connection
- *                  bd address
+ *                  connection bd address
  *
  * Parameters       server_if: server interface.
  *                  remote_bda: remote device BD address.
  *                  is_direct: direct connection or background auto connection
  *                  transport : Transport on which GATT connection to be opened
- *(BR/EDR or LE)
+ *                              (BR/EDR or LE)
  *
  * Returns          void
  *
@@ -304,8 +302,7 @@ void BTA_GATTS_Open(tBTA_GATTS_IF server_if, BD_ADDR remote_bda, bool is_direct,
  * Function         BTA_GATTS_CancelOpen
  *
  * Description      Cancel a direct open connection or remove a background auto
- *connection
- *                  bd address
+ *                  connection bd address
  *
  * Parameters       server_if: server interface.
  *                  remote_bda: remote device BD address.
diff --git a/system/bta/gatt/bta_gatts_utils.cc b/system/bta/gatt/bta_gatts_utils.cc
index 3301293de5937e9dc1da7a64568f427c284ac6c2..2196a2c4b3e836efeb2e052bf5a49dd19eb45f65 100644
--- a/system/bta/gatt/bta_gatts_utils.cc
+++ b/system/bta/gatt/bta_gatts_utils.cc
@@ -103,7 +103,7 @@ tBTA_GATTS_RCB* bta_gatts_find_app_rcb_by_app_if(tBTA_GATTS_IF server_if) {
  * Description      find the index of the application control block by app ID.
  *
  * Returns          index of the control block, or BTA_GATTS_INVALID_APP if
- *failed.
+ *                  failed.
  *
  ******************************************************************************/
 
diff --git a/system/bta/hf_client/bta_hf_client_at.cc b/system/bta/hf_client/bta_hf_client_at.cc
index 54c3a017058c4a3e5cd56903a733fae3c5ccf37b..f607528bfa5f7e77ab5b8110a8aa3e974612443c 100644
--- a/system/bta/hf_client/bta_hf_client_at.cc
+++ b/system/bta/hf_client/bta_hf_client_at.cc
@@ -236,8 +236,7 @@ static void bta_hf_client_start_at_hold_timer(void) {
  *          COMMON AT EVENT HANDLING funcS
  *
  *   Receives data (strings, ints, etc.) from the parser and processes this
- *data.
- *   No buffer parsing is being done here.
+ *   data. No buffer parsing is being done here.
  ******************************************************************************/
 
 static void bta_hf_client_handle_ok() {
diff --git a/system/bta/hf_client/bta_hf_client_sco.cc b/system/bta/hf_client/bta_hf_client_sco.cc
index 05c1160c2093b922a5c2626800215c1b440f4e12..64918dc72606fd5523bda16b86e6160cb98c4300 100644
--- a/system/bta/hf_client/bta_hf_client_sco.cc
+++ b/system/bta/hf_client/bta_hf_client_sco.cc
@@ -80,9 +80,9 @@ enum {
  *
  * Description      Removes the specified SCO from the system.
  *                  If only_active is true, then SCO is only removed if
- *connected
+ *                  connected.
  *
- * Returns          bool   - true if Sco removal was started
+ * Returns          bool   - true if SCO removal was started
  *
  ******************************************************************************/
 static bool bta_hf_client_sco_remove(bool only_active) {
diff --git a/system/bta/hh/bta_hh_act.cc b/system/bta/hh/bta_hh_act.cc
index 3437ce301d322430107ddf9e79a5f4239a82f8a7..6240211b1b021316d9f1b867e0b02bb016d2d889 100644
--- a/system/bta/hh/bta_hh_act.cc
+++ b/system/bta/hh/bta_hh_act.cc
@@ -382,9 +382,8 @@ void bta_hh_start_sdp(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
  *
  * Function         bta_hh_sdp_cmpl
  *
- * Description      When SDP completed, initiate a connection or report error
- *depend
- *                  on SDP result.
+ * Description      When SDP completes, initiate a connection or report an error
+ *                  depending on the SDP result.
  *
  *
  * Returns          void
@@ -760,8 +759,7 @@ void bta_hh_ctrl_dat_act(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
  * Function         bta_hh_open_failure
  *
  * Description      report HID open failure when at wait for connection state
- *and receive
- *                  device close event.
+ *                  and receive device close event.
  *
  *
  * Returns          void
diff --git a/system/bta/hh/bta_hh_api.cc b/system/bta/hh/bta_hh_api.cc
index 1aa32b4867cad39461efca34bbe714764487ea5a..26c90515ea145327dd1d1e1ee40d84a982ff4ddf 100644
--- a/system/bta/hh/bta_hh_api.cc
+++ b/system/bta/hh/bta_hh_api.cc
@@ -262,14 +262,11 @@ void BTA_HhSendCtrl(uint8_t dev_handle, tBTA_HH_TRANS_CTRL_TYPE c_type) {
  *                  dev_bda: remote device address
  *                  p_data: data to be sent in the DATA transaction; or
  *                          the data to be write into the Output Report of a LE
- *HID
- *                          device. The report is identified the report ID which
- *is
- *                          the value of the byte (uint8_t *)(p_buf + 1) +
- *p_buf->offset.
+ *                          HID device. The report is identified the report ID
+ *                          which is the value of the byte
+ *                          (uint8_t *)(p_buf + 1) + *p_buf->offset.
  *                          p_data->layer_specific needs to be set to the report
- *type,
- *                          it can be OUTPUT report, or FEATURE report.
+ *                          type. It can be OUTPUT report, or FEATURE report.
  *
  * Returns          void
  *
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index bbda22cc7449d2968f8a2d8567aa6e53ce16f21f..d33084c031df7352bd741e1f13fea941bd855832 100644
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -235,8 +235,7 @@ static const char* bta_hh_le_rpt_name[4] = {"UNKNOWN", "INPUT", "OUTPUT",
  * Function         bta_hh_le_hid_report_dbg
  *
  * Description      debug function to print out all HID report available on
- *remote
- *                  device.
+ *                  remote device.
  *
  * Returns          void
  *
@@ -425,7 +424,7 @@ void bta_hh_le_open_conn(tBTA_HH_DEV_CB* p_cb, BD_ADDR remote_bda) {
  * Function         bta_hh_le_find_dev_cb_by_conn_id
  *
  * Description      Utility function find a device control block by connection
- *ID.
+ *                  ID.
  *
  ******************************************************************************/
 tBTA_HH_DEV_CB* bta_hh_le_find_dev_cb_by_conn_id(uint16_t conn_id) {
@@ -476,8 +475,7 @@ uint8_t bta_hh_le_find_service_inst_by_battery_inst_id(tBTA_HH_DEV_CB* p_cb,
  * Function         bta_hh_le_find_report_entry
  *
  * Description      find the report entry by service instance and report UUID
- *and
- *                  instance ID
+ *                  and instance ID
  *
  ******************************************************************************/
 tBTA_HH_LE_RPT* bta_hh_le_find_report_entry(
@@ -548,7 +546,7 @@ tBTA_HH_LE_RPT* bta_hh_le_find_rpt_by_idtype(tBTA_HH_LE_RPT* p_head,
  * Function         bta_hh_le_find_alloc_report_entry
  *
  * Description      find or allocate a report entry in the HID service report
- *list.
+ *                  list.
  *
  ******************************************************************************/
 tBTA_HH_LE_RPT* bta_hh_le_find_alloc_report_entry(tBTA_HH_DEV_CB* p_cb,
@@ -981,8 +979,7 @@ bool bta_hh_le_set_protocol_mode(tBTA_HH_DEV_CB* p_cb,
  * Function         get_protocol_mode_cb
  *
  * Description      Process the Read protocol mode, send GET_PROTO_EVT to
- *application
- *                  with the protocol mode.
+ *                  application with the protocol mode.
  *
  ******************************************************************************/
 static void get_protocol_mode_cb(uint16_t conn_id, tGATT_STATUS status,
@@ -1084,8 +1081,7 @@ void bta_hh_le_dis_cback(BD_ADDR addr, tDIS_VALUE* p_dis_value) {
  * Function         bta_hh_le_pri_service_discovery
  *
  * Description      Initialize GATT discovery on the remote LE HID device by
- *opening
- *                  a GATT connection first.
+ *                  opening a GATT connection first.
  *
  * Parameters:
  *
@@ -1144,7 +1140,7 @@ void bta_hh_le_encrypt_cback(BD_ADDR bd_addr,
  *
  * Description      Security check completed, start the service discovery
  *                  if no cache available, otherwise report connection open
- *completed
+ *                  completed
  *
  * Parameters:
  *
@@ -1791,7 +1787,7 @@ void bta_hh_le_open_fail(tBTA_HH_DEV_CB* p_cb, tBTA_HH_DATA* p_data) {
  * Function         bta_hh_gatt_close
  *
  * Description      action function to process the GATT close int he state
- *machine.
+ *                  machine.
  *
  * Returns          void
  *
@@ -1849,8 +1845,7 @@ void bta_hh_le_api_disc_act(tBTA_HH_DEV_CB* p_cb) {
  * Function         read_report_cb
  *
  * Description      Process the Read report complete, send GET_REPORT_EVT to
- *application
- *                  with the report data.
+ *                  application with the report data.
  *
  * Parameters:
  *
@@ -2108,7 +2103,7 @@ void bta_hh_le_get_dscp_act(tBTA_HH_DEV_CB* p_cb) {
  * Function         bta_hh_le_add_dev_bg_conn
  *
  * Description      Remove a LE HID device from back ground connection
- *procedure.
+ *                  procedure.
  *
  * Returns          void
  *
@@ -2141,7 +2136,7 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB* p_cb, bool check_bond) {
  * Function         bta_hh_le_add_device
  *
  * Description      Add a LE HID device as a known device, and also add the
- *address
+ *                  address
  *                  into back ground connection WL for incoming connection.
  *
  * Returns          void
@@ -2174,7 +2169,7 @@ uint8_t bta_hh_le_add_device(tBTA_HH_DEV_CB* p_cb,
  * Function         bta_hh_le_remove_dev_bg_conn
  *
  * Description      Remove a LE HID device from back ground connection
- *procedure.
+ *                  procedure.
  *
  * Returns          void
  *
@@ -2264,7 +2259,7 @@ static void read_report_descriptor_ccc_cb(uint16_t conn_id, tGATT_STATUS status,
  * Function         bta_hh_le_hid_read_rpt_clt_cfg
  *
  * Description      a test command to read report descriptor client
- *configuration
+ *                  configuration
  *
  * Returns          void
  *
diff --git a/system/bta/hh/bta_hh_utils.cc b/system/bta/hh/bta_hh_utils.cc
index 82600c3332fc4516bc55072e217867503037da9c..8274c9588cb2784a8bf07aa738bcb0c42262ad33 100644
--- a/system/bta/hh/bta_hh_utils.cc
+++ b/system/bta/hh/bta_hh_utils.cc
@@ -415,7 +415,7 @@ tBTA_HH_STATUS bta_hh_read_ssr_param(BD_ADDR bd_addr, uint16_t* p_max_ssr_lat,
  * Function         bta_hh_cleanup_disable
  *
  * Description      when disable finished, cleanup control block and send
- *callback
+ *                  callback
  *
  *
  * Returns          void
@@ -440,7 +440,7 @@ void bta_hh_cleanup_disable(tBTA_HH_STATUS status) {
  * Function         bta_hh_dev_handle_to_cb_idx
  *
  * Description      convert a HID device handle to the device control block
- *index.
+ *                  index.
  *
  *
  * Returns          uint8_t: index of the device control block.
diff --git a/system/bta/hl/bta_hl_act.cc b/system/bta/hl/bta_hl_act.cc
index f96690bf92221912c8ca6ae52255c6ae06b59fc5..5db57072d6528c5fb2ac7c1ebf3357e87732b18e 100644
--- a/system/bta/hl/bta_hl_act.cc
+++ b/system/bta/hl/bta_hl_act.cc
@@ -2083,7 +2083,7 @@ void bta_hl_cch_mca_disconnect(uint8_t app_idx, uint8_t mcl_idx,
  * Function         bta_hl_cch_mca_disc_open
  *
  * Description      Action routine for disconnect the just opened Control
- *channel
+ *                  channel
  *
  * Returns          void
  *
diff --git a/system/bta/hl/bta_hl_api.cc b/system/bta/hl/bta_hl_api.cc
index 93e853c5b84d901ae13c8eb79a138504e3278f9a..cc0ae0603c699624bc69ef4a2b4f6afe828a66b1 100644
--- a/system/bta/hl/bta_hl_api.cc
+++ b/system/bta/hl/bta_hl_api.cc
@@ -204,7 +204,7 @@ void BTA_HlDeregister(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle) {
  * Function         BTA_HlCchOpen
  *
  * Description      Open a Control channel connection with the specified BD
- *address
+ *                  address
  *
  * Parameters       app_handle - Application Handle
  *                  p_open_param - parameters for opening a control channel
@@ -214,9 +214,8 @@ void BTA_HlDeregister(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle) {
  *                  Note: The control PSM value is used to select which
  *                  HDP insatnce should be used in case the peer device support
  *                  multiple HDP instances. Also, if the control PSM value is
- *zero
- *                  then the first HDP instance is used for the control channel
- *setup
+ *                  zero then the first HDP instance is used for the control
+ *                  channel setup
  ******************************************************************************/
 void BTA_HlCchOpen(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle,
                    tBTA_HL_CCH_OPEN_PARAM* p_open_param) {
@@ -261,7 +260,7 @@ void BTA_HlCchClose(tBTA_HL_MCL_HANDLE mcl_handle) {
  * Function         BTA_HlDchOpen
  *
  * Description      Open a data channel connection with the specified DCH
- *parameters
+ *                  parameters
  *
  * Parameters       mcl_handle - MCL handle
  *                  p_open_param - parameters for opening a data channel
@@ -391,8 +390,7 @@ void BTA_HlSendData(tBTA_HL_MDL_HANDLE mdl_handle, uint16_t pkt_size) {
  *
  *                  note: If mdl_id = 0xFFFF then this means to delete all MDLs
  *                        and this value can only be used with DeleteMdl request
- *only
- *                        not other requests
+ *                        only not other requests
  *
  ******************************************************************************/
 void BTA_HlDeleteMdl(tBTA_HL_MCL_HANDLE mcl_handle, tBTA_HL_MDL_ID mdl_id) {
@@ -466,12 +464,9 @@ void BTA_HlSdpQuery(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle,
  *
  * Parameters       mcl_handle  - MCL handle
  *                  p_rsp_param - parameters specified whether the request
- *should
- *                                be accepted or not and if it should be
- *accepted
- *                                then it also specified the configuration
- *response
- *                                value
+ *                                should be accepted or not and if it should be
+ *                                accepted, then it also specified the
+ *                                configuration response value
  *
  * Returns          void
  *
diff --git a/system/bta/hl/bta_hl_main.cc b/system/bta/hl/bta_hl_main.cc
index 9be6813bd50011b5cdc4bf4d6364285d9da1d289..6f1533897a940c8fffce190e806a408ca57ea4f5 100644
--- a/system/bta/hl/bta_hl_main.cc
+++ b/system/bta/hl/bta_hl_main.cc
@@ -587,7 +587,7 @@ static void bta_hl_api_disable(tBTA_HL_CB* p_cb, tBTA_HL_DATA* p_data) {
  * Function         bta_hl_api_update
  *
  * Description      Process the API registration request to register an HDP
- *applciation
+ *                  application
  *
  * Returns          void
  *
@@ -655,7 +655,7 @@ static void bta_hl_api_update(tBTA_HL_CB* p_cb, tBTA_HL_DATA* p_data) {
  * Function         bta_hl_api_register
  *
  * Description      Process the API registration request to register an HDP
- *applciation
+ *                  application
  *
  * Returns          void
  *
diff --git a/system/bta/hl/bta_hl_sdp.cc b/system/bta/hl/bta_hl_sdp.cc
index 94c913697c44c1b6227f27ab669db9047e430181..69b6f68e49ca8f1ca22bcb5d5a6d7652e5dbac25 100644
--- a/system/bta/hl/bta_hl_sdp.cc
+++ b/system/bta/hl/bta_hl_sdp.cc
@@ -132,10 +132,8 @@ int bta_hl_compose_supported_feature_list(
  *
  * Description      This function is called to add a protocol descriptor list to
  *                  a record. This would be through the SDP database maintenance
- *API.
- *                  If the protocol list already exists in the record, it is
- *replaced
- *                  with the new list.
+ *                  API. If the protocol list already exists in the record, it
+ *                  is replaced with the new list.
  *
  * Returns          true if added OK, else false
  *
@@ -519,13 +517,10 @@ tBTA_HL_STATUS bta_hl_sdp_register(uint8_t app_idx) {
  * Function         bta_hl_find_sink_or_src_srv_class_in_db
  *
  * Description      This function queries an SDP database for either a HDP Sink
- *or
- *                  Source service class ID.
+ *                  or Source service class ID.
  *                  If the p_start_rec pointer is NULL, it looks from the
- *beginning
- *                  of the database, else it continues from the next record
- *after
- *                  p_start_rec.
+ *                  beginning of the database, else it continues from the next
+ *                  record after p_start_rec.
  *
  * Returns          Pointer to record containing service class, or NULL
  *
diff --git a/system/bta/hl/bta_hl_utils.cc b/system/bta/hl/bta_hl_utils.cc
index 061e64ed00344511e4bd87aabb71ac6d8828af65..1dea0a2c34a59ad40e1035cec2c26f2c981d1e5a 100644
--- a/system/bta/hl/bta_hl_utils.cc
+++ b/system/bta/hl/bta_hl_utils.cc
@@ -248,8 +248,7 @@ BT_HDR* bta_hl_get_buf(uint16_t data_size, bool fcs_use) {
  * Function      bta_hl_find_service_in_db
  *
  * Description  This function check the specified service class(es) can be find
- *in
- *              the received SDP database
+ *              in the received SDP database
  *
  * Returns      bool true - found
  *                      false - not found
@@ -284,7 +283,7 @@ bool bta_hl_find_service_in_db(uint8_t app_idx, uint8_t mcl_idx,
  *
  *
  * Description  This function finds the service class(es) for both CCH and DCH
- *oeprations
+ *              operations
  *
  * Returns      uint16_t - service_id
  *                       if service_uuid = 0xFFFF then it means service uuid
@@ -1501,8 +1500,7 @@ bool bta_hl_delete_mdl_cfg(uint8_t app_idx, BD_ADDR bd_addr,
  * Function      bta_hl_is_mdl_value_valid
  *
  *
- * Description  This function checks the specified MDL ID is in valid range or
- *not
+ * Description  This function checks the specified MDL ID is in valid range.
  *
  * Returns      bool - true Success
  *                        false Failed
@@ -1659,15 +1657,13 @@ bool bta_hl_validate_peer_cfg(uint8_t app_idx, uint8_t mcl_idx, uint8_t mdl_idx,
  *
  * Function      bta_hl_chk_local_cfg
  *
- * Description  This function check whether the local DCH configuration is OK or
- *not
+ * Description  This function check whether the local DCH configuration is OK.
  *
  * Returns      tBTA_HL_STATUS - OK - local DCH configuration is OK
  *                               NO_FIRST_RELIABLE - the streaming DCH
- *configuration
- *                                                   is not OK and it needs to
- *use
- *                                                   reliable DCH configuration
+ *                                                   configuration is not OK and
+ *                                                   it needs to use reliable
+ *                                                   DCH configuration
  *
  ******************************************************************************/
 tBTA_HL_STATUS bta_hl_chk_local_cfg(uint8_t app_idx, uint8_t mcl_idx,
@@ -2419,8 +2415,7 @@ bool bta_hl_validate_chan_cfg(uint8_t app_idx, uint8_t mcl_idx,
  *
  * Function      bta_hl_is_cong_on
  *
- * Description    This function checks whether the congestion condition is on or
- *not
+ * Description    This function checks whether the congestion condition is on.
  *
  * Returns      bool - true DCH is congested
  *                        false not congested
@@ -2450,8 +2445,7 @@ bool bta_hl_is_cong_on(uint8_t app_id, BD_ADDR bd_addr, tBTA_HL_MDL_ID mdl_id)
  * Function      bta_hl_check_cch_close
  *
  * Description   This function checks whether there is a pending CCH close
- *request
- *               or not
+ *               request or not
  *
  * Returns      void
  ******************************************************************************/
diff --git a/system/bta/include/bta_ag_co.h b/system/bta/include/bta_ag_co.h
index 336019d0681509e633597233aa057511fa151315..f03322f9c397d3aef0b5af7f0b90d8a38f2d57e3 100644
--- a/system/bta/include/bta_ag_co.h
+++ b/system/bta/include/bta_ag_co.h
@@ -51,17 +51,16 @@ extern void bta_ag_co_init(void);
  * Function         bta_ag_co_audio_state
  *
  * Description      This function is called by the AG before the audio
- *connection
+ *                  connection
  *                  is brought up, after it comes up, and after it goes down.
  *
  * Parameters       handle - handle of the AG instance
  *                  state - Audio state
  *                  codec - if WBS support is compiled in, codec to going to be
- *used is provided
- *                      and when in SCO_STATE_SETUP, BTM_I2SPCMConfig() must be
- *called with
- *                      the correct platform parameters.
- *                      in the other states codec type should not be ignored
+ *                          used is provided and when in SCO_STATE_SETUP,
+ *                          BTM_I2SPCMConfig() must be called with the correct
+ *                          platform parameters. In the other states, codec type
+ *                          should not be ignored
  *
  * Returns          void
  *
@@ -80,7 +79,7 @@ extern void bta_ag_co_audio_state(uint16_t handle, uint8_t app_id,
  * Function         bta_ag_co_data_open
  *
  * Description      This function is executed by AG when a service level
- *connection
+ *                  connection
  *                  is opened.  The phone can use this function to set
  *                  up data paths or perform any required initialization or
  *                  set up particular to the connected service.
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index a583d7076052cac5a0112cdf5a56b684eeccf9e7..f9d137fd25ded39fe188aba37bc43f4e29396437 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -1322,10 +1322,9 @@ extern void BTA_DmSetDeviceName(char* p_name);
  *
  * Description      This function sets the Bluetooth connectable,discoverable,
  *                  pairable and conn paired only modesmodes of the local
- *device.
+ *                  device.
  *                  This controls whether other Bluetooth devices can find and
- *connect to
- *                  the local device.
+ *                  connect to the local device.
  *
  *
  * Returns          void
@@ -1425,9 +1424,8 @@ extern void BTA_DmBond(BD_ADDR bd_addr);
  *
  * Description      This function initiates a bonding procedure with a peer
  *                  device by designated transport.  The bonding procedure
- *enables
- *                  authentication and optionally encryption on the Bluetooth
- *link.
+ *                  enables authentication and optionally encryption on the
+ *                  Bluetooth link.
  *
  *
  * Returns          void
@@ -1583,7 +1581,7 @@ extern void BTA_DmCloseACL(BD_ADDR bd_addr, bool remove_dev,
  * Function         bta_dmexecutecallback
  *
  * Description      This function will request BTA to execute a call back in the
- *context of BTU task
+ *                  context of BTU task.
  *                  This API was named in lower case because it is only intended
  *                  for the internal customers(like BTIF).
  *
@@ -1615,15 +1613,14 @@ extern void BTA_DmPcmInitSamples(uint32_t src_sps, uint32_t bits,
  * Function         BTA_DmPcmResample
  *
  * Description      Down sampling utility to convert higher sampling rate into
- *8K/16bits
+ *                  8K/16bits
  *                  PCM samples.
  *
  * Parameters       p_src: pointer to the buffer where the original sampling PCM
  *                              are stored.
  *                  in_bytes:  Length of the input PCM sample buffer in byte.
- *                  p_dst:      pointer to the buffer which is to be used to
- *store
- *                              the converted PCM samples.
+ *                  p_dst: pointer to the buffer which is to be used to store
+ *                         the converted PCM samples.
  *
  *
  * Returns          int32_t: number of samples converted.
@@ -1656,10 +1653,9 @@ extern void BTA_DmBleSecurityGrant(BD_ADDR bd_addr, tBTA_DM_BLE_SEC_GRANT res);
  *                  peripheral device.
  *
  * Parameters       bg_conn_type: it can be auto connection, or selective
- *connection.
+ *                                connection.
  *                  p_select_cback: callback function when selective connection
- *procedure
- *                              is being used.
+ *                                  procedure is being used.
  *
  * Returns          void
  *
@@ -1692,7 +1688,7 @@ extern void BTA_DmBlePasskeyReply(BD_ADDR bd_addr, bool accept,
  *
  * Parameters:      bd_addr          - BD address of the peer
  *                  accept           - numbers to compare are the same or
- *different.
+ *                                     different.
  *
  * Returns          void
  *
@@ -1785,7 +1781,7 @@ extern void BTA_DmSetBleConnScanParams(uint32_t scan_interval,
  *                  scan_window - scan window
  *                  scan_mode - scan mode
  *                  scan_param_setup_status_cback - Set scan param status
- *callback
+ *                                                  callback
  *
  * Returns          void
  *
@@ -1800,10 +1796,9 @@ extern void BTA_DmSetBleScanParams(
  * Function         BTA_DmSetBleAdvParams
  *
  * Description      This function sets the advertising parameters BLE
- *functionality.
+ *                  functionality.
  *                  It is to be called when device act in peripheral or
- *broadcaster
- *                  role.
+ *                  broadcaster role.
  *
  * Parameters:      adv_int_min    - adv interval minimum
  *                  adv_int_max    - adv interval max
@@ -1819,16 +1814,15 @@ extern void BTA_DmSetBleAdvParams(uint16_t adv_int_min, uint16_t adv_int_max,
  * Function         BTA_DmSearchExt
  *
  * Description      This function searches for peer Bluetooth devices. It
- *performs
- *                  an inquiry and gets the remote name for devices. Service
- *                  discovery is done if services is non zero
+ *                  performs an inquiry and gets the remote name for devices.
+ *                  Service discovery is done if services is non zero
  *
  * Parameters       p_dm_inq: inquiry conditions
  *                  services: if service is not empty, service discovery will be
- *done.
+ *                            done.
  *                            for all GATT based service condition, put
- *num_uuid, and
- *                            p_uuid is the pointer to the list of UUID values.
+ *                            num_uuid, and p_uuid is the pointer to the list of
+ *                            UUID values.
  *                  p_cback: callback functino when search is completed.
  *
  *
@@ -1895,12 +1889,10 @@ extern void BTA_DmDiscoverByTransport(BD_ADDR bd_addr,
  *                  p_callback    - Pointer to callback function to indicat the
  *                                  link encryption status
  *                  sec_act       - This is the security action to indicate
- *                                  what knid of BLE security level is required
- *for
- *                                  the BLE link if the BLE is supported
- *                                  Note: This parameter is ignored for the
- *BR/EDR link
- *                                        or the BLE is not supported
+ *                                  what kind of BLE security level is required
+ *                                  for the BLE link if BLE is supported
+ *                                  Note: This parameter is ignored for
+ *                                        BR/EDR or if BLE is not supported.
  *
  * Returns          void
  *
@@ -1919,7 +1911,7 @@ extern void BTA_DmSetEncryption(BD_ADDR bd_addr, tBTA_TRANSPORT transport,
  *
  * Parameters       start: start or stop observe.
  *                  duration : Duration of the scan. Continuous scan if 0 is
- *passed
+ *                             passed
  *                  p_results_cb: Callback to be called with scan results
  *
  * Returns          void
@@ -1963,15 +1955,13 @@ extern void BTA_DmBleEnableRemotePrivacy(BD_ADDR bd_addr, bool privacy_enable);
  * Function         BTA_DmBleUpdateConnectionParams
  *
  * Description      Update connection parameters, can only be used when
- *connection is up.
+ *                  connection is up.
  *
  * Parameters:      bd_addr   - BD address of the peer
- *                  min_int   -     minimum connection interval, [0x0004~
- *0x4000]
- *                  max_int   -     maximum connection interval, [0x0004~
- *0x4000]
- *                  latency   -     slave latency [0 ~ 500]
- *                  timeout   -     supervision timeout [0x000a ~ 0xc80]
+ *                  min_int   - minimum connection interval, [0x0004 ~ 0x4000]
+ *                  max_int   - maximum connection interval, [0x0004 ~ 0x4000]
+ *                  latency   - slave latency [0 ~ 500]
+ *                  timeout   - supervision timeout [0x000a ~ 0xc80]
  *
  * Returns          void
  *
@@ -1999,13 +1989,14 @@ extern void BTA_DmBleSetDataLength(BD_ADDR remote_device,
  * Description      This function is called to set the storage parameters
  *
  * Parameters       batch_scan_full_max -Max storage space (in %) allocated to
- *full scanning
+ *                                       full scanning
  *                  batch_scan_trunc_max -Max storage space (in %) allocated to
- *truncated scanning
+ *                                        truncated scanning
  *                  batch_scan_notify_threshold - Setup notification level based
- *on total space
- *                  consumed by both pools. Setting it to 0 will disable
- *threshold notification
+ *                                                on total space consumed by
+ *                                                both pools. Setting it to 0
+ *                                                will disable threshold
+ *                                                notification
  *                  p_setup_cback - Setup callback
  *                  p_thres_cback - Threshold callback
  *                  p_rep_cback - Reports callback
@@ -2077,7 +2068,7 @@ extern void BTA_DmBleDisableBatchScan(tBTA_DM_BLE_REF_VALUE ref_value);
  * Function         BTA_DmEnableScanFilter
  *
  * Description      This function is called to enable the adv data payload
- *filter
+ *                  filter
  *
  * Parameters       action - enable or disable the APCF feature
  *                  p_cmpl_cback - Command completed callback
@@ -2097,7 +2088,7 @@ extern void BTA_DmEnableScanFilter(uint8_t action,
  * Description      This function is called to setup the filter params
  *
  * Parameters       p_target: enable the filter condition on a target device; if
- *NULL
+ *                            NULL
  *                  filt_index - Filter index
  *                  p_filt_params -Filter parameters
  *                  ref_value - Reference value
@@ -2119,8 +2110,7 @@ extern void BTA_DmBleScanFilterSetup(uint8_t action,
  * Function         BTA_DmBleCfgFilterCondition
  *
  * Description      This function is called to configure the adv data payload
- *filter
- *                  condition.
+ *                  filter condition.
  *
  * Parameters       action: to read/write/clear
  *                  cond_type: filter condition type
@@ -2173,7 +2163,7 @@ extern void BTA_DmBleGetEnergyInfo(tBTA_BLE_ENERGY_INFO_CBACK* p_cmpl_cback);
  * Function         BTA_BrcmInit
  *
  * Description      This function initializes Broadcom specific VS handler in
- *BTA
+ *                  BTA
  *
  * Returns          void
  *
@@ -2185,7 +2175,7 @@ extern void BTA_VendorInit(void);
  * Function         BTA_BrcmCleanup
  *
  * Description      This function frees up Broadcom specific VS specific dynamic
- *memory
+ *                  memory
  *
  * Returns          void
  *
diff --git a/system/bta/include/bta_ar_api.h b/system/bta/include/bta_ar_api.h
index 46bb3717330d5684b7050c50c9db54266cec769c..d6a8147df0a6dbdafc17eca4fa52ca8e4e179aa5 100644
--- a/system/bta/include/bta_ar_api.h
+++ b/system/bta/include/bta_ar_api.h
@@ -83,8 +83,7 @@ extern void bta_ar_dereg_avdt(tBTA_SYS_ID sys_id);
  * Function         bta_ar_avdt_conn
  *
  * Description      This function is called to let ar know that some AVDTP
- *profile
- *                  is connected for this sys_id.
+ *                  profile is connected for this sys_id.
  *                  If the other sys modules started a timer for PENDING_EVT,
  *                  the timer can be stopped now.
  *
@@ -135,7 +134,7 @@ extern void bta_ar_reg_avrc(uint16_t service_uuid, const char* p_service_name,
  * Function         bta_ar_dereg_avrc
  *
  * Description      This function is called to de-register/delete an SDP record
- *for AVRCP.
+ *                  for AVRCP.
  *
  * Returns          void
  *
diff --git a/system/bta/include/bta_av_api.h b/system/bta/include/bta_av_api.h
index af38ac2502a118434a2b2c5bfc8186df515e2129..edc21de778e163855cd028df5ca905967a3028d1 100644
--- a/system/bta/include/bta_av_api.h
+++ b/system/bta/include/bta_av_api.h
@@ -615,8 +615,7 @@ void BTA_AvStop(bool suspend);
  *
  * Description      Reconfigure the audio/video stream.
  *                  If suspend is true, this function tries the
- *suspend/reconfigure
- *                  procedure first.
+ *                  suspend/reconfigure procedure first.
  *                  If suspend is false or when suspend/reconfigure fails,
  *                  this function closes and re-opens the AVDT connection.
  *
@@ -775,8 +774,7 @@ void BTA_AvMetaCmd(uint8_t rc_handle, uint8_t label, tBTA_AV_CMD cmd_code,
  *
  * Description      Request Starting of A2DP Offload.
  *                  This function is used to start A2DP offload if vendor lib
- *has
- *                  the feature enabled.
+ *                  has the feature enabled.
  *
  * Returns          void
  *
diff --git a/system/bta/include/bta_av_co.h b/system/bta/include/bta_av_co.h
index 271099eca37d5be95a1213a06bc80f629291be98..a7cc30eaf45c9887039475e0628361a36bc35de3 100644
--- a/system/bta/include/bta_av_co.h
+++ b/system/bta/include/bta_av_co.h
@@ -90,7 +90,7 @@ tA2DP_STATUS bta_av_co_audio_getconfig(tBTA_AV_HNDL hndl, uint8_t* p_codec_info,
  *
  * Description      This callout function is executed by AV to set the
  *                  codec and content protection configuration of the audio
- *stream.
+ *                  stream.
  *
  *
  * Returns          void
@@ -106,8 +106,7 @@ void bta_av_co_audio_setconfig(tBTA_AV_HNDL hndl, const uint8_t* p_codec_info,
  * Function         bta_av_co_audio_open
  *
  * Description      This function is called by AV when the audio stream
- *connection
- *                  is opened.
+ *                  connection is opened.
  *                  BTA-AV maintains the MTU of A2DP streams.
  *                  If this is the 2nd audio stream, mtu is the smaller of the 2
  *                  streams.
@@ -123,8 +122,7 @@ void bta_av_co_audio_open(tBTA_AV_HNDL hndl, uint8_t* p_codec_info,
  * Function         bta_av_co_audio_close
  *
  * Description      This function is called by AV when the audio stream
- *connection
- *                  is closed.
+ *                  connection is closed.
  *                  BTA-AV maintains the MTU of A2DP streams.
  *                  When one stream is closed and no other audio stream is open,
  *                  mtu is reported as 0.
@@ -195,8 +193,8 @@ void bta_av_co_audio_drop(tBTA_AV_HNDL hndl);
  * Function         bta_av_co_audio_delay
  *
  * Description      This function is called by AV when the audio stream
- *connection
- *                  needs to send the initial delay report to the connected SRC.
+ *                  connection needs to send the initial delay report to the
+ *                  connected SRC.
  *
  *
  * Returns          void
diff --git a/system/bta/include/bta_dm_co.h b/system/bta/include/bta_dm_co.h
index 1dffd882ff4c5bfcbc0bf188aa8a5a976c6be297..13f3020df9f44a06afa89785280285c5f025b0ce 100644
--- a/system/bta/include/bta_dm_co.h
+++ b/system/bta/include/bta_dm_co.h
@@ -58,13 +58,13 @@ typedef tBTM_SCO_ROUTE_TYPE tBTA_DM_SCO_ROUTE_TYPE;
  * Function         bta_dm_co_io_req
  *
  * Description      This callout function is executed by DM to get IO
- *capabilities
- *                  of the local device for the Simple Pairing process
+ *                  capabilities of the local device for the Simple Pairing
+ *                  process
  *
  * Parameters       bd_addr  - The peer device
  *                  *p_io_cap - The local Input/Output capabilities
  *                  *p_oob_data - true, if OOB data is available for the peer
- *device.
+ *                                device.
  *                  *p_auth_req - true, if MITM protection is required.
  *
  * Returns          void.
@@ -79,13 +79,13 @@ extern void bta_dm_co_io_req(BD_ADDR bd_addr, tBTA_IO_CAP* p_io_cap,
  * Function         bta_dm_co_io_rsp
  *
  * Description      This callout function is executed by DM to report IO
- *capabilities
- *                  of the peer device for the Simple Pairing process
+ *                  capabilities of the peer device for the Simple Pairing
+ *                  process
  *
  * Parameters       bd_addr  - The peer device
  *                  io_cap - The remote Input/Output capabilities
  *                  oob_data - true, if OOB data is available for the peer
- *device.
+ *                             device.
  *                  auth_req - true, if MITM protection is required.
  *
  * Returns          void.
@@ -148,8 +148,7 @@ extern void bta_dm_co_rmt_oob(BD_ADDR bd_addr);
  *
  * Description      This function can be used by the phone to initialize audio
  *                  codec or for other initialization purposes before SCO
- *connection
- *                  is opened.
+ *                  connection is opened.
  *
  *
  * Returns          Void.
@@ -200,7 +199,7 @@ extern void bta_dm_sco_co_out_data(BT_HDR** p_buf);
  * Function         bta_dm_sco_co_in_data
  *
  * Description      This function is called to send incoming SCO data to
- *application.
+ *                  application.
  *
  * Returns          void
  *
@@ -212,15 +211,14 @@ extern void bta_dm_sco_co_in_data(BT_HDR* p_buf, tBTM_SCO_DATA_FLAG status);
  * Function         bta_dm_co_ble_io_req
  *
  * Description      This callout function is executed by DM to get BLE IO
- *capabilities
- *                  before SMP pairing gets going.
+ *                  capabilities before SMP pairing gets going.
  *
  * Parameters       bd_addr  - The peer device
  *                  *p_io_cap - The local Input/Output capabilities
  *                  *p_oob_data - true, if OOB data is available for the peer
- *device.
+ *                                device.
  *                  *p_auth_req -  Auth request setting (Bonding and MITM
- *required or not)
+ *                                                       required or not)
  *                  *p_max_key_size - max key size local device supported.
  *                  *p_init_key - initiator keys.
  *                  *p_resp_key - responder keys.
@@ -240,8 +238,7 @@ extern void bta_dm_co_ble_io_req(BD_ADDR bd_addr, tBTA_IO_CAP* p_io_cap,
  * Function         bta_dm_co_ble_local_key_reload
  *
  * Description      This callout function is to load the local BLE keys if
- *available
- *                  on the device.
+ *                  available on the device.
  *
  * Parameters       none
  *
@@ -257,15 +254,14 @@ extern void bta_dm_co_ble_load_local_keys(
  * Function         bta_dm_co_ble_io_req
  *
  * Description      This callout function is executed by DM to get BLE IO
- *capabilities
- *                  before SMP pairing gets going.
+ *                  capabilities before SMP pairing gets going.
  *
  * Parameters       bd_addr  - The peer device
  *                  *p_io_cap - The local Input/Output capabilities
  *                  *p_oob_data - true, if OOB data is available for the peer
- *device.
+ *                                device.
  *                  *p_auth_req -  Auth request setting (Bonding and MITM
- *required or not)
+ *                                                       required or not)
  *                  *p_max_key_size - max key size local device supported.
  *                  *p_init_key - initiator keys.
  *                  *p_resp_key - responder keys.
diff --git a/system/bta/include/bta_gatt_api.h b/system/bta/include/bta_gatt_api.h
index 1be65fdefd412e39f9eca50bcbbc7a05b33d20c1..6df3f82d173e1aaffb19c77ed5445c566d631882 100644
--- a/system/bta/include/bta_gatt_api.h
+++ b/system/bta/include/bta_gatt_api.h
@@ -650,16 +650,13 @@ extern void BTA_GATTC_Close(uint16_t conn_id);
  * Function         BTA_GATTC_ServiceSearchRequest
  *
  * Description      This function is called to request a GATT service discovery
- *                    on a GATT server. This function report service search
- *result
+ *                  on a GATT server. This function report service search result
  *                  by a callback event, and followed by a service search
- *complete
- *                  event.
+ *                  complete event.
  *
  * Parameters       conn_id: connection ID.
  *                  p_srvc_uuid: a UUID of the service application is interested
- *in.
- *                              If Null, discover for all services.
+ *                               in. If Null, discover for all services.
  *
  * Returns          None
  *
@@ -672,7 +669,7 @@ extern void BTA_GATTC_ServiceSearchRequest(uint16_t conn_id,
  * Function         BTA_GATTC_GetServices
  *
  * Description      This function is called to find the services on the given
- *server.
+ *                  server.
  *
  * Parameters       conn_id: connection ID which identify the server.
  *
@@ -686,7 +683,7 @@ extern const list_t* BTA_GATTC_GetServices(uint16_t conn_id);
  * Function         BTA_GATTC_GetCharacteristic
  *
  * Description      This function is called to find the characteristic on the
- *given server.
+ *                  given server.
  *
  * Parameters       conn_id: connection ID which identify the server.
  *                  handle: characteristic handle
@@ -702,7 +699,7 @@ extern const tBTA_GATTC_CHARACTERISTIC* BTA_GATTC_GetCharacteristic(
  * Function         BTA_GATTC_GetDescriptor
  *
  * Description      This function is called to find the characteristic on the
- *given server.
+ *                  given server.
  *
  * Parameters       conn_id: connection ID which identify the server.
  *                  handle: descriptor handle
@@ -824,7 +821,7 @@ extern void BTA_GATTC_SendIndConfirm(uint16_t conn_id, uint16_t handle);
  * Function         BTA_GATTC_RegisterForNotifications
  *
  * Description      This function is called to register for notification of a
- *service.
+ *                  service.
  *
  * Parameters       client_if - client interface.
  *                  remote_bda - target GATT server.
@@ -841,7 +838,7 @@ extern tBTA_GATT_STATUS BTA_GATTC_RegisterForNotifications(
  * Function         BTA_GATTC_DeregisterForNotifications
  *
  * Description      This function is called to de-register for notification of a
- *servbice.
+ *                  service.
  *
  * Parameters       client_if - client interface.
  *                  remote_bda - target GATT server.
@@ -858,7 +855,7 @@ extern tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications(
  * Function         BTA_GATTC_PrepareWrite
  *
  * Description      This function is called to prepare write a characteristic
- *value.
+ *                  value.
  *
  * Parameters       conn_id - connection ID.
  *                  handle - GATT characteritic handle.
@@ -878,7 +875,7 @@ extern void BTA_GATTC_PrepareWrite(uint16_t conn_id, uint16_t handle,
  * Function         BTA_GATTC_ExecuteWrite
  *
  * Description      This function is called to execute write a prepare write
- *sequence.
+ *                  sequence.
  *
  * Parameters       conn_id - connection ID.
  *                    is_execute - execute or cancel.
@@ -1015,9 +1012,8 @@ extern uint16_t BTA_GATTS_AddService(tBTA_GATTS_IF server_if,
  * Function         BTA_GATTS_DeleteService
  *
  * Description      This function is called to delete a service. When this is
- *done,
- *                  a callback event BTA_GATTS_DELETE_EVT is report with the
- *status.
+ *                  done, a callback event BTA_GATTS_DELETE_EVT is report with
+ *                  the status.
  *
  * Parameters       service_id: service_id to be deleted.
  *
@@ -1044,13 +1040,13 @@ extern void BTA_GATTS_StopService(uint16_t service_id);
  * Function         BTA_GATTS_HandleValueIndication
  *
  * Description      This function is called to read a characteristics
- *descriptor.
+ *                  descriptor.
  *
  * Parameters       conn_id - connection identifier.
  *                  attr_id - attribute ID to indicate.
  *                  value - data to indicate.
  *                  need_confirm - if this indication expects a confirmation or
- *not.
+ *                                 not.
  *
  * Returns          None
  *
@@ -1081,8 +1077,7 @@ extern void BTA_GATTS_SendRsp(uint16_t conn_id, uint32_t trans_id,
  * Function         BTA_GATTS_Open
  *
  * Description      Open a direct open connection or add a background auto
- *connection
- *                  bd address
+ *                  connection bd address
  *
  * Parameters       server_if: server interface.
  *                  remote_bda: remote device BD address.
@@ -1099,8 +1094,7 @@ extern void BTA_GATTS_Open(tBTA_GATTS_IF server_if, BD_ADDR remote_bda,
  * Function         BTA_GATTS_CancelOpen
  *
  * Description      Cancel a direct open connection or remove a background auto
- *connection
- *                  bd address
+ *                  connection bd address
  *
  * Parameters       server_if: server interface.
  *                  remote_bda: remote device BD address.
diff --git a/system/bta/include/bta_gatts_co.h b/system/bta/include/bta_gatts_co.h
index c84f4491894aa981f5771e8858662a2ed28a34cc..ed7f1c88f8882f17b194d7581ec243bb2b47da9e 100644
--- a/system/bta/include/bta_gatts_co.h
+++ b/system/bta/include/bta_gatts_co.h
@@ -35,11 +35,10 @@ extern "C" {
  * Function         bta_gatts_co_update_handle_range
  *
  * Description      This callout function is executed by GATTS when a GATT
- *server
- *                  handle range ios to be added or removed.
+ *                  server handle range ios to be added or removed.
  *
  * Parameter        is_add: true is to add a handle range; otherwise is to
- *delete.
+ *                          delete.
  *                  p_hndl_range: handle range.
  *
  * Returns          void.
@@ -54,8 +53,7 @@ extern void bta_gatts_co_update_handle_range(
  *
  * Description      This call-out is to read/write/remove service change related
  *                  informaiton. The request consists of the cmd and p_req and
- *the
- *                  response is returned in p_rsp
+ *                  the response is returned in p_rsp
  *
  * Parameter        cmd - request command
  *                  p_req - request paramters
@@ -75,8 +73,7 @@ extern bool bta_gatts_co_srv_chg(tBTA_GATTS_SRV_CHG_CMD cmd,
  * Function         bta_gatts_co_load_handle_range
  *
  * Description      This callout function is executed by GATTS when a GATT
- *server
- *                  handle range is requested to be loaded from NV.
+ *                  server handle range is requested to be loaded from NV.
  *
  * Parameter
  *
diff --git a/system/bta/include/bta_hh_api.h b/system/bta/include/bta_hh_api.h
index 6d2ad69ae189f9884ababefb3fc1c37f14ddb37e..9f33722a775de2a0c59c71a7a133f0ec034c22c9 100644
--- a/system/bta/include/bta_hh_api.h
+++ b/system/bta/include/bta_hh_api.h
@@ -364,7 +364,7 @@ extern void BTA_HhSetProtoMode(uint8_t handle, tBTA_HH_PROTO_MODE t_type);
  * Function         BTA_HhGetProtoMode
  *
  * Description      This function get the protocol mode of a specified HID
- *device.
+ *                  device.
  *
  * Returns          void
  *
diff --git a/system/bta/include/bta_hh_co.h b/system/bta/include/bta_hh_co.h
index ac44c21541f47b06e006447735a97db26ca191a5..ac52696bfda08dae4b29f700c852d6c1169b5523 100644
--- a/system/bta/include/bta_hh_co.h
+++ b/system/bta/include/bta_hh_co.h
@@ -43,7 +43,7 @@ typedef struct {
  * Function         bta_hh_co_data
  *
  * Description      This callout function is executed by HH when data is
- *received
+ *                  received
  *                  in interupt channel.
  *
  *
@@ -107,10 +107,9 @@ extern void bta_hh_le_co_rpt_info(BD_ADDR remote_bda,
  * Function         bta_hh_le_co_cache_load
  *
  * Description      This callout function is to request the application to load
- *the
- *                  cached HOGP report if there is any. When cache reading is
- *completed,
- *                  bta_hh_le_ci_cache_load() is called by the application.
+ *                  the cached HOGP report if there is any. When cache reading
+ *                  is completed, bta_hh_le_ci_cache_load() is called by the
+ *                  application.
  *
  * Parameters       remote_bda  - remote device address
  *                  p_num_rpt: number of cached report
diff --git a/system/bta/include/bta_hl_api.h b/system/bta/include/bta_hl_api.h
index bc7ae8ce0cb69c360ea6713ee7481e9e73030e9e..39a43f80d5e09a49cfc278534d661acb12fe8962 100644
--- a/system/bta/include/bta_hl_api.h
+++ b/system/bta/include/bta_hl_api.h
@@ -655,8 +655,7 @@ extern void BTA_HlDeregister(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle);
  * Function         BTA_HlCchOpen
  *
  * Description      Open a Control channel connection with the specified BD
- *address
- *                  and the control PSM value is used to select which
+ *                  address and the control PSM value is used to select which
  *                  HDP insatnce should be used in case the peer device support
  *                  multiple HDP instances.
  *
@@ -691,7 +690,7 @@ extern void BTA_HlCchClose(tBTA_HL_MCL_HANDLE mcl_handle);
  * Function         BTA_HlDchOpen
  *
  * Description      Open a data channel connection with the specified DCH
- *parameters
+ *                  parameters
  *
  * Parameters       mcl_handle - MCL handle
  *                  p_open_param - parameters for opening a data channel
@@ -770,8 +769,7 @@ extern void BTA_HlSendData(tBTA_HL_MDL_HANDLE mdl_handle, uint16_t pkt_size);
  *
  *                  note: If mdl_id = 0xFFFF then this means to delete all MDLs
  *                        and this value can only be used with DeleteMdl request
- *only
- *                        not other requests
+ *                        only not other requests
  *
  ******************************************************************************/
 extern void BTA_HlDeleteMdl(tBTA_HL_MCL_HANDLE mcl_handle,
@@ -817,12 +815,9 @@ extern void BTA_HlSdpQuery(uint8_t app_id, tBTA_HL_APP_HANDLE app_handle,
  *
  * Parameters       mcl_handle  - MCL handle
  *                  p_rsp_param - parameters specified whether the request
- *should
- *                                be accepted or not and if it should be
- *accepted
- *                                then it also specified the configuration
- *response
- *                                value
+ *                                should be accepted or not and if it should be
+ *                                accepted then it also specified the
+ *                                configuration response value
  *
  * Returns          void
  *
diff --git a/system/bta/include/bta_hl_co.h b/system/bta/include/bta_hl_co.h
index 7a290c53c39613f4c2885d45c32ed60876788832..efdd1d323764510455d0e07c40245c1aeef479ba 100644
--- a/system/bta/include/bta_hl_co.h
+++ b/system/bta/include/bta_hl_co.h
@@ -48,7 +48,7 @@ extern "C" {
  *
  * Parameters      app_id - application ID
  *                 p_num_of_mdep (output) - number of MDEP configurations
- *supported
+ *                                          supported
  *                                          by the application
  *
  * Returns         Bloolean - true success
@@ -61,7 +61,7 @@ extern bool bta_hl_co_get_num_of_mdep(uint8_t app_id, uint8_t* p_num_of_mdep);
  *
  * Description     This function is called to find out whether the SOURCE MDEP
  *                 configuration information should be advertize in the SDP or
- *nopt
+ *                 not
  *
  * Parameters      app_id - application ID
  *
@@ -76,7 +76,7 @@ extern bool bta_hl_co_advrtise_source_sdp(uint8_t app_id);
  *
  * Description     This function is called to get the supported feature
  *                 configuration for the specified mdep index and it also
- *assigns
+ *                 assigns
  *                 the MDEP ID for the specified mdep index
  *
  * Parameters      app_id - HDP application ID
@@ -102,8 +102,7 @@ extern bool bta_hl_co_get_mdep_config(uint8_t app_id, uint8_t mdep_idx,
  *
  * Parameters      app_id - HDP application ID
  *                 p_echo_cfg (output) - pointer to the Echo test maximum APDU
- *size
- *                                       configuration
+ *                                       size configuration
  *
  * Returns         Bloolean - true success
  ******************************************************************************/
@@ -115,8 +114,7 @@ extern bool bta_hl_co_get_echo_config(uint8_t app_id,
  * Function        bta_hl_co_save_mdl
  *
  * Description     This function is called to save a MDL configuration item in
- *persistent
- *                 storage
+ *                 persistent storage
  *
  * Parameters      app_id - HDP application ID
  *                 item_idx - the MDL configuration storage index
@@ -132,8 +130,7 @@ extern void bta_hl_co_save_mdl(uint8_t app_id, uint8_t item_idx,
  * Function        bta_hl_co_delete_mdl
  *
  * Description     This function is called to delete a MDL configuration item in
- *persistent
- *                 storage
+ *                 persistent storage
  *
  * Parameters      app_id - HDP application ID
  *                 item_idx - the MDL configuration storage index
diff --git a/system/bta/include/bta_jv_api.h b/system/bta/include/bta_jv_api.h
index b25b312e05d8fa3623aa13afa543947223883ad4..6d55df3e3f2cc7e016bed2203f28bcb8e737cd99 100644
--- a/system/bta/include/bta_jv_api.h
+++ b/system/bta/include/bta_jv_api.h
@@ -435,19 +435,15 @@ bool BTA_JvIsEncrypted(BD_ADDR bd_addr);
  * Description      This function reserves a SCN/PSM for applications running
  *                  over RFCOMM or L2CAP. It is primarily called by
  *                  server profiles/applications to register their SCN/PSM into
- *the
- *                  SDP database. The SCN is reported by the tBTA_JV_DM_CBACK
- *                  callback with a BTA_JV_GET_SCN_EVT.
+ *                  the SDP database. The SCN is reported by the
+ *                  tBTA_JV_DM_CBACK callback with a BTA_JV_GET_SCN_EVT.
  *                  If the SCN/PSM reported is 0, that means all SCN resources
- *are
- *                  exhausted.
+ *                  are exhausted.
  *                  The channel parameter can be used to request a specific
  *                  channel. If the request on the specific channel fails, the
  *                  SCN/PSM returned in the EVT will be 0 - no attempt to
- *request
- *                  a new channel will be made. set channel to <= 0 to
- *automatically
- *                  assign an channel ID.
+ *                  request a new channel will be made. set channel to <= 0 to
+ *                  automatically assign an channel ID.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -572,8 +568,7 @@ tBTA_JV_STATUS BTA_JvL2capClose(uint32_t handle);
  * Function         BTA_JvL2capCloseLE
  *
  * Description      This function closes an L2CAP client connection for Fixed
- *Channels
- *                  Function is idempotent and no callbacks are called!
+ *                  Channels Function is idempotent and no callbacks are called!
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -586,11 +581,11 @@ tBTA_JV_STATUS BTA_JvL2capCloseLE(uint32_t handle);
  * Function         BTA_JvL2capStartServer
  *
  * Description      This function starts an L2CAP server and listens for an
- *L2CAP
- *                  connection from a remote Bluetooth device.  When the server
- *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
- *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
- *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
+ *                  L2CAP connection from a remote Bluetooth device.  When the
+ *                  server is started successfully, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_START_EVT.  When the connection is
+ *                  established, tBTA_JV_L2CAP_CBACK is called with
+ *                  BTA_JV_L2CAP_OPEN_EVT.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -606,9 +601,8 @@ tBTA_JV_STATUS BTA_JvL2capStartServer(
  * Function         BTA_JvL2capStartServerLE
  *
  * Description      This function starts an LE L2CAP server and listens for an
- *L2CAP
- *                  connection from a remote Bluetooth device on a fixed channel
- *                  over an LE link.  When the server
+ *                  L2CAP connection from a remote Bluetooth device on a fixed
+ *                  channel over an LE link.  When the server
  *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
  *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
  *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
@@ -629,8 +623,7 @@ tBTA_JV_STATUS BTA_JvL2capStartServerLE(tBTA_SEC sec_mask, tBTA_JV_ROLE role,
  * Function         BTA_JvL2capStopServerLE
  *
  * Description      This function stops the LE L2CAP server. If the server has
- *an
- *                  active connection, it would be closed.
+ *                  an active connection, it would be closed.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -643,8 +636,7 @@ tBTA_JV_STATUS BTA_JvL2capStopServerLE(uint16_t local_chan, void* user_data);
  * Function         BTA_JvL2capStopServerLE
  *
  * Description      This function stops the LE L2CAP server. If the server has
- *an
- *                  active connection, it would be closed.
+ *                  an active connection, it would be closed.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -723,7 +715,7 @@ tBTA_JV_STATUS BTA_JvL2capWriteFixed(uint16_t channel, BD_ADDR* addr,
  *                  Address.
  *                  When the connection is initiated or failed to initiate,
  *                  tBTA_JV_RFCOMM_CBACK is called with
- *BTA_JV_RFCOMM_CL_INIT_EVT
+ *                  BTA_JV_RFCOMM_CL_INIT_EVT
  *                  When the connection is established or failed,
  *                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_OPEN_EVT
  *
@@ -800,22 +792,22 @@ tBTA_JV_STATUS BTA_JvRfcommWrite(uint32_t handle, uint32_t req_id);
  * Function    BTA_JVSetPmProfile
  *
  * Description This function set or free power mode profile for different JV
- *application
+ *             application
  *
  * Parameters:  handle,  JV handle from RFCOMM or L2CAP
  *              app_id:  app specific pm ID, can be BTA_JV_PM_ALL, see
- *bta_dm_cfg.c for details
+ *                       bta_dm_cfg.c for details
  *              BTA_JV_PM_ID_CLEAR: removes pm management on the handle. init_st
- *is ignored and
- *              BTA_JV_CONN_CLOSE is called implicitely
- *              init_st:  state after calling this API. typically it should be
- *BTA_JV_CONN_OPEN
+ *                                  is ignored and BTA_JV_CONN_CLOSE is called
+ *                                  implicitly
+ *              init_st: state after calling this API. typically it should be
+ *                       BTA_JV_CONN_OPEN
  *
  * Returns      BTA_JV_SUCCESS, if the request is being processed.
  *              BTA_JV_FAILURE, otherwise.
  *
  * NOTE:        BTA_JV_PM_ID_CLEAR: In general no need to be called as jv pm
- *calls automatically
+ *                                  calls automatically
  *              BTA_JV_CONN_CLOSE to remove in case of connection close!
  *
  *******************************************************************************/
diff --git a/system/bta/include/bta_pan_api.h b/system/bta/include/bta_pan_api.h
index 8eae000ad7a086cf2b1c15b073146dde628c5346..4e91828d1f0cf2df463781fbec7ea18fafe8e43a 100644
--- a/system/bta/include/bta_pan_api.h
+++ b/system/bta/include/bta_pan_api.h
@@ -144,7 +144,7 @@ extern void BTA_PanDisable(void);
  *
  * Description      Sets PAN roles. When the enable operation is complete
  *                  the callback function will be called with a
- *BTA_PAN_SET_ROLE_EVT.
+ *                  BTA_PAN_SET_ROLE_EVT.
  *
  * Returns          void
  *
diff --git a/system/bta/include/bta_pan_ci.h b/system/bta/include/bta_pan_ci.h
index a5ae0e31ba5b449208b46449c75bbbe1099536f1..7c46cce3be7e2412d47cf87a0fbd7731dbf8a607 100644
--- a/system/bta/include/bta_pan_ci.h
+++ b/system/bta/include/bta_pan_ci.h
@@ -39,7 +39,7 @@ extern "C" {
  *
  * Description      This function sends an event to PAN indicating the phone is
  *                  ready for more data and PAN should call
- *bta_pan_co_tx_path().
+ *                  bta_pan_co_tx_path().
  *                  This function is used when the TX data path is configured
  *                  to use a pull interface.
  *
diff --git a/system/bta/include/bta_sdp_api.h b/system/bta/include/bta_sdp_api.h
index 6884ea95e260e63f7865a8875c4d2c8abbae4279..37a7774ca2d598ee42f07424bece3e3487e30a14 100644
--- a/system/bta/include/bta_sdp_api.h
+++ b/system/bta/include/bta_sdp_api.h
@@ -102,8 +102,7 @@ extern tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK* p_cback);
  * Description      Start a search for sdp records for a specific BD_ADDR with a
  *                  specific profile uuid.
  *                  When the search operation is completed, the callback
- *function
- *                  will be called with a BTA_SDP_SEARCH_EVT.
+ *                  function will be called with a BTA_SDP_SEARCH_EVT.
  * Returns          BTA_SDP_SUCCESS if successful.
  *                  BTA_SDP_FAIL if internal failure.
  *
diff --git a/system/bta/include/utl.h b/system/bta/include/utl.h
index 200a965c72659d0d27cd958a7adde8f5335830ee..71b186f9b5d22ac636b65edec95178c215bc201a 100644
--- a/system/bta/include/utl.h
+++ b/system/bta/include/utl.h
@@ -113,15 +113,15 @@ extern uint8_t utl_itoa(uint16_t i, char* p_s);
  *
  *                  cmd     - the fields of the device class to update.
  *                            BTA_UTL_SET_COD_MAJOR_MINOR, - overwrite major,
- *minor class
+ *                                                           minor class
  *                            BTA_UTL_SET_COD_SERVICE_CLASS - set the bits in
- *the input
+ *                                                            the input
  *                            BTA_UTL_CLR_COD_SERVICE_CLASS - clear the bits in
- *the input
+ *                                                            the input
  *                            BTA_UTL_SET_COD_ALL - overwrite major, minor, set
- *the bits in service class
+ *                                                  the bits in service class
  *                            BTA_UTL_INIT_COD - overwrite major, minor, and
- *service class
+ *                                               service class
  *
  * Returns          true if successful, Otherwise false
  *
diff --git a/system/bta/jv/bta_jv_act.cc b/system/bta/jv/bta_jv_act.cc
index 962cccfaf6265c8575f7ee356481992debb4fea8..44e53af2df40d8fe9f5e1c82a5e0c28484b011ff 100644
--- a/system/bta/jv/bta_jv_act.cc
+++ b/system/bta/jv/bta_jv_act.cc
@@ -207,7 +207,7 @@ tBTA_JV_RFC_CB* bta_jv_alloc_rfc_cb(uint16_t port_handle,
  * Function     bta_jv_rfc_port_to_pcb
  *
  * Description  find the port control block associated with the given port
- *handle
+ *              handle
  *
  * Returns
  *
@@ -228,7 +228,7 @@ tBTA_JV_PCB* bta_jv_rfc_port_to_pcb(uint16_t port_handle) {
  * Function     bta_jv_rfc_port_to_cb
  *
  * Description  find the RFCOMM control block associated with the given port
- *handle
+ *              handle
  *
  * Returns
  *
@@ -383,13 +383,12 @@ tBTA_JV_STATUS bta_jv_free_l2c_cb(tBTA_JV_L2C_CB* p_cb) {
  * Function    bta_jv_clear_pm_cb
  *
  * Description clears jv pm control block and optionally calls
- *bta_sys_conn_close()
+ *             bta_sys_conn_close()
  *             In general close_conn should be set to true to remove registering
- *with
- *             dm pm!
+ *             with dm pm!
  *
  * WARNING:    Make sure to clear pointer form port or l2c to this control block
- *too!
+ *             too!
  *
  ******************************************************************************/
 static void bta_jv_clear_pm_cb(tBTA_JV_PM_CB* p_pm_cb, bool close_conn) {
@@ -411,7 +410,7 @@ static void bta_jv_clear_pm_cb(tBTA_JV_PM_CB* p_pm_cb, bool close_conn) {
  *
  * Returns     BTA_JV_SUCCESS if cb has been freed correctly,
  *             BTA_JV_FAILURE in case of no profile has been registered or
- *already freed
+ *             already freed
  *
  *******************************************************************************/
 static tBTA_JV_STATUS bta_jv_free_set_pm_profile_cb(uint32_t jv_handle) {
@@ -2019,12 +2018,12 @@ void bta_jv_change_pm_state(tBTA_JV_MSG* p_data) {
  * Function    bta_jv_set_pm_conn_state
  *
  * Description Send pm event state change to jv state machine to serialize jv pm
- *changes
- *             in relation to other jv messages. internal API use mainly.
+ *             changes in relation to other jv messages. internal API use
+ *             mainly.
  *
  * Params:     p_cb: jv pm control block, NULL pointer returns failure
  *             new_state: new PM connections state, setting is forced by action
- *function
+ *                        function
  *
  * Returns     BTA_JV_SUCCESS, BTA_JV_FAILURE (buffer allocation, or NULL ptr!)
  *
diff --git a/system/bta/jv/bta_jv_api.cc b/system/bta/jv/bta_jv_api.cc
index a1de8db804d10420cc278ba6e0043dd7af405c17..b26df8c4ae41bbf1a93d2e04a8b82431bf98a94d 100644
--- a/system/bta/jv/bta_jv_api.cc
+++ b/system/bta/jv/bta_jv_api.cc
@@ -132,9 +132,9 @@ bool BTA_JvIsEncrypted(BD_ADDR bd_addr) {
  *                  applications running over RFCOMM, L2CAP of L2CAP_LE.
  *                  It is primarily called by server profiles/applications to
  *                  register their SCN into the SDP database. The SCN is
- *reported
- *                  by the tBTA_JV_DM_CBACK callback with a BTA_JV_GET_SCN_EVT
- *                  for RFCOMM channels and BTA_JV_GET_PSM_EVT for L2CAP and LE.
+ *                  reported by the tBTA_JV_DM_CBACK callback with a
+ *                  BTA_JV_GET_SCN_EVT for RFCOMM channels and
+ *                  BTA_JV_GET_PSM_EVT for L2CAP and LE.
  *                  If the SCN/PSM reported is 0, that means all resources are
  *                  exhausted.
  * Parameters
@@ -417,8 +417,7 @@ tBTA_JV_STATUS BTA_JvL2capClose(uint32_t handle) {
  * Function         BTA_JvL2capCloseLE
  *
  * Description      This function closes an L2CAP client connection for Fixed
- *Channels
- *                  Function is idempotent and no callbacks are called!
+ *                  Channels Function is idempotent and no callbacks are called!
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -443,11 +442,11 @@ tBTA_JV_STATUS BTA_JvL2capCloseLE(uint32_t handle) {
  * Function         BTA_JvL2capStartServer
  *
  * Description      This function starts an L2CAP server and listens for an
- *L2CAP
- *                  connection from a remote Bluetooth device.  When the server
- *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
- *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
- *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
+ *                  L2CAP connection from a remote Bluetooth device.  When the
+ *                  server is started successfully, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_START_EVT.  When the connection is
+ *                  established tBTA_JV_L2CAP_CBACK is called with
+ *                  BTA_JV_L2CAP_OPEN_EVT.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -494,11 +493,11 @@ tBTA_JV_STATUS BTA_JvL2capStartServer(
  * Function         BTA_JvL2capStartServerLE
  *
  * Description      This function starts an LE L2CAP server and listens for an
- *L2CAP
- *                  connection from a remote Bluetooth device.  When the server
- *                  is started successfully, tBTA_JV_L2CAP_CBACK is called with
- *                  BTA_JV_L2CAP_START_EVT.  When the connection is established,
- *                  tBTA_JV_L2CAP_CBACK is called with BTA_JV_L2CAP_OPEN_EVT.
+ *                  L2CAP connection from a remote Bluetooth device.  When the
+ *                  server is started successfully, tBTA_JV_L2CAP_CBACK is
+ *                  called with BTA_JV_L2CAP_START_EVT.  When the connection is
+ *                  established, tBTA_JV_L2CAP_CBACK is called with
+ *                  BTA_JV_L2CAP_OPEN_EVT.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -571,8 +570,7 @@ tBTA_JV_STATUS BTA_JvL2capStopServer(uint16_t local_psm, void* user_data) {
  * Function         BTA_JvL2capStopServerLE
  *
  * Description      This function stops the LE L2CAP server. If the server has
- *an
- *                  active connection, it would be closed.
+ *                  an active connection, it would be closed.
  *
  * Returns          BTA_JV_SUCCESS, if the request is being processed.
  *                  BTA_JV_FAILURE, otherwise.
@@ -743,7 +741,7 @@ tBTA_JV_STATUS BTA_JvL2capWriteFixed(uint16_t channel, BD_ADDR* addr,
  *                  Address.
  *                  When the connection is initiated or failed to initiate,
  *                  tBTA_JV_RFCOMM_CBACK is called with
- *BTA_JV_RFCOMM_CL_INIT_EVT
+ *                  BTA_JV_RFCOMM_CL_INIT_EVT
  *                  When the connection is established or failed,
  *                  tBTA_JV_RFCOMM_CBACK is called with BTA_JV_RFCOMM_OPEN_EVT
  *
@@ -940,23 +938,22 @@ tBTA_JV_STATUS BTA_JvRfcommWrite(uint32_t handle, uint32_t req_id) {
  *
  * Function    BTA_JVSetPmProfile
  *
- * Description This function set or free power mode profile for different JV
- *application
+ * Description: This function set or free power mode profile for different JV
+ *              application.
  *
  * Parameters:  handle,  JV handle from RFCOMM or L2CAP
  *              app_id:  app specific pm ID, can be BTA_JV_PM_ALL, see
- *bta_dm_cfg.c for details
+ *                       bta_dm_cfg.c for details
  *              BTA_JV_PM_ID_CLEAR: removes pm management on the handle. init_st
- *is ignored and
- *              BTA_JV_CONN_CLOSE is called implicitely
+ *              is ignored and BTA_JV_CONN_CLOSE is called implicitly
  *              init_st:  state after calling this API. typically it should be
- *BTA_JV_CONN_OPEN
+ *                        BTA_JV_CONN_OPEN
  *
  * Returns      BTA_JV_SUCCESS, if the request is being processed.
  *              BTA_JV_FAILURE, otherwise.
  *
  * NOTE:        BTA_JV_PM_ID_CLEAR: In general no need to be called as jv pm
- *calls automatically
+ *                                  calls automatically
  *              BTA_JV_CONN_CLOSE to remove in case of connection close!
  *
  *******************************************************************************/
diff --git a/system/bta/pan/bta_pan_api.cc b/system/bta/pan/bta_pan_api.cc
index 7210018b15e89ef9ec12e2f53dc10ecea23a6c64..cfb0588afd3470d0a7505c18b6584db7f376adaf 100644
--- a/system/bta/pan/bta_pan_api.cc
+++ b/system/bta/pan/bta_pan_api.cc
@@ -89,7 +89,7 @@ void BTA_PanDisable(void) {
  *
  * Description      Sets PAN roles. When the enable operation is complete
  *                  the callback function will be called with a
- *BTA_PAN_SET_ROLE_EVT.
+ *                  BTA_PAN_SET_ROLE_EVT.
  *
  * Returns          void
  *
diff --git a/system/bta/pan/bta_pan_ci.cc b/system/bta/pan/bta_pan_ci.cc
index 8f9054a8e969d169169c63f23b97e99b4f9c0b52..f44ebee12b93ccda8f5ef025dd1ae5844dc279be 100644
--- a/system/bta/pan/bta_pan_ci.cc
+++ b/system/bta/pan/bta_pan_ci.cc
@@ -43,7 +43,7 @@
  *
  * Description      This function sends an event to PAN indicating the phone is
  *                  ready for more data and PAN should call
- *bta_pan_co_tx_path().
+ *                  bta_pan_co_tx_path().
  *                  This function is used when the TX data path is configured
  *                  to use a pull interface.
  *
diff --git a/system/bta/sdp/bta_sdp_api.cc b/system/bta/sdp/bta_sdp_api.cc
index 340d3f47821ee3daa35a41775b48910d48d40dc5..7160423edb7b5d5e4225b2822c40faf5b7e7a9bc 100644
--- a/system/bta/sdp/bta_sdp_api.cc
+++ b/system/bta/sdp/bta_sdp_api.cc
@@ -79,10 +79,9 @@ tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK* p_cback) {
  * Function         BTA_SdpSearch
  *
  * Description      This function performs service discovery for a specific
- *service
- *                  on given peer device. When the operation is completed
- *                  the tBTA_SDP_DM_CBACK callback function will be  called with
- *                  a BTA_SDP_SEARCH_COMPLETE_EVT.
+ *                  service on given peer device. When the operation is
+ *                  completed the tBTA_SDP_DM_CBACK callback function will be
+ *                  called with a BTA_SDP_SEARCH_COMPLETE_EVT.
  *
  * Returns          BTA_SDP_SUCCESS, if the request is being processed.
  *                  BTA_SDP_FAILURE, otherwise.
diff --git a/system/bta/sys/bta_sys_conn.cc b/system/bta/sys/bta_sys_conn.cc
index 7f897ff34a54816c44fe608ecc17cfd9d97281d3..27967ccf3bdfee0b0ee0f694ce036ab2a63cd2a2 100644
--- a/system/bta/sys/bta_sys_conn.cc
+++ b/system/bta/sys/bta_sys_conn.cc
@@ -223,8 +223,7 @@ void bta_sys_conn_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr) {
  * Function         bta_sys_app_open
  *
  * Description      Called by BTA subsystems when application initiates
- *connection
- *                  to a peer device
+ *                  connection to a peer device
  *
  *
  * Returns          void
@@ -257,8 +256,7 @@ void bta_sys_app_close(uint8_t id, uint8_t app_id, BD_ADDR peer_addr) {
  * Function         bta_sys_sco_open
  *
  * Description      Called by BTA subsystems when sco connection for that
- *service
- *                  is open
+ *                  service is open
  *
  * Returns          void
  *
@@ -280,8 +278,7 @@ void bta_sys_sco_open(uint8_t id, uint8_t app_id, BD_ADDR peer_addr) {
  * Function         bta_sys_sco_close
  *
  * Description      Called by BTA subsystems when sco connection for that
- *service
- *                  is closed
+ *                  service is closed
  *
  * Returns          void
  *
@@ -323,8 +320,7 @@ void bta_sys_sco_use(UNUSED_ATTR uint8_t id, uint8_t app_id,
  * Function         bta_sys_sco_unuse
  *
  * Description      Called by BTA subsystems when sco connection for that
- *service
- *                  is no longer needed.
+ *                  service is no longer needed.
  *
  * Returns          void
  *
@@ -343,8 +339,7 @@ void bta_sys_sco_unuse(UNUSED_ATTR uint8_t id, uint8_t app_id,
  * Function         bta_sys_chg_ssr_config
  *
  * Description      Called by BTA subsystems to indicate that the given app SSR
- *setting
- *                  need to be changed.
+ *                  setting needs to be changed.
  *
  * Returns          void
  *
@@ -467,8 +462,7 @@ void bta_sys_busy(uint8_t id, uint8_t app_id, BD_ADDR peer_addr) {
  * Function         bta_sys_eir_register
  *
  * Description      Called by BTA DM to register EIR utility function that can
- *be
- *                  used by the other BTA modules to add/remove UUID.
+ *                  be used by the other BTA modules to add/remove UUID.
  *
  * Returns          void
  *
diff --git a/system/bta/sys/bta_sys_main.cc b/system/bta/sys/bta_sys_main.cc
index 689ba5d468cf3964f51f8dbf09a02ca08aac2e88..39ba6e7811ba82b1ca55f9f48acca38d864fc142 100644
--- a/system/bta/sys/bta_sys_main.cc
+++ b/system/bta/sys/bta_sys_main.cc
@@ -250,7 +250,7 @@ void bta_sys_hw_unregister(tBTA_SYS_HW_MODULE module) {
  * Function         bta_sys_hw_btm_cback
  *
  * Description     This function is registered by BTA SYS to BTM in order to get
- *status notifications
+ *                 status notifications
  *
  *
  * Returns
@@ -280,7 +280,7 @@ void bta_sys_hw_btm_cback(tBTM_DEV_STATUS status) {
  * Function         bta_sys_hw_error
  *
  * Description     In case the HW device stops answering... Try to turn it off,
- *then re-enable all
+ *                 then re-enable all
  *                      previously active SW modules.
  *
  * Returns          success or failure
@@ -313,7 +313,7 @@ void bta_sys_hw_error(UNUSED_ATTR tBTA_SYS_HW_MSG* p_sys_hw_msg) {
  * Function         bta_sys_hw_enable
  *
  * Description     this function is called after API enable and HW has been
- *turned on
+ *                 turned on
  *
  *
  * Returns          success or failure
@@ -349,8 +349,8 @@ void bta_sys_hw_api_enable(tBTA_SYS_HW_MSG* p_sys_hw_msg) {
  *
  * Function         bta_sys_hw_disable
  *
- * Description     if no other module is using the HW, this function will call (
- *if defined ) a user-macro to turn off the HW
+ * Description     if no other module is using the HW, this function will call
+ *                 (if defined) a user-macro to turn off the HW
  *
  *
  * Returns          success or failure
@@ -428,10 +428,9 @@ void bta_sys_hw_evt_disabled(tBTA_SYS_HW_MSG* p_sys_hw_msg) {
  *
  * Function         bta_sys_hw_event_stack_enabled
  *
- * Description     we receive this event once the SW side is ready ( stack, FW
- *download,... ),
- *                       i.e. we can really start using the device. So notify
- *the app.
+ * Description     we receive this event once the SW side is ready (stack, FW
+ *                 download,... ), i.e. we can really start using the device. So
+ *                 notify the app.
  *
  * Returns          success or failure
  *
diff --git a/system/bta/sys/utl.cc b/system/bta/sys/utl.cc
index fc1a12aa9c3f3a6871de69e77456f9588bf0bf7d..7feda3371153f6e7eca1e7e67ac1b5619657b75e 100644
--- a/system/bta/sys/utl.cc
+++ b/system/bta/sys/utl.cc
@@ -143,15 +143,15 @@ uint8_t utl_itoa(uint16_t i, char* p_s) {
  *
  *                  cmd     - the fields of the device class to update.
  *                            BTA_UTL_SET_COD_MAJOR_MINOR, - overwrite major,
- *minor class
+ *                                                           minor class
  *                            BTA_UTL_SET_COD_SERVICE_CLASS - set the bits in
- *the input
+ *                                                            the input
  *                            BTA_UTL_CLR_COD_SERVICE_CLASS - clear the bits in
- *the input
+ *                                                            the input
  *                            BTA_UTL_SET_COD_ALL - overwrite major, minor, set
- *the bits in service class
+ *                                                  the bits in service class
  *                            BTA_UTL_INIT_COD - overwrite major, minor, and
- *service class
+ *                                               service class
  *
  * Returns          true if successful, Otherwise false
  *