Merge "SCO: Use const reference instead of const value"

5 files changed, 18 insertions, 16 deletions

diff --git a/system/bta/test/common/mock_stack_btm_sco.cc b/system/bta/test/common/mock_stack_btm_sco.cc
index 62c05ab59c..c09cdee836 100644
--- a/system/bta/test/common/mock_stack_btm_sco.cc
+++ b/system/bta/test/common/mock_stack_btm_sco.cc
@@ -100,7 +100,7 @@ void btm_sco_chk_pend_rolechange(uint16_t hci_handle) {
 void btm_sco_chk_pend_unpark(tHCI_STATUS hci_status, uint16_t hci_handle) {
   mock_function_count_map[__func__]++;
 }
-void btm_sco_conn_req(const RawAddress& bda, DEV_CLASS dev_class,
+void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS& dev_class,
                       uint8_t link_type) {
   mock_function_count_map[__func__]++;
 }
diff --git a/system/main/shim/acl_legacy_interface.h b/system/main/shim/acl_legacy_interface.h
index d146428831..049caa26f9 100644
--- a/system/main/shim/acl_legacy_interface.h
+++ b/system/main/shim/acl_legacy_interface.h
@@ -50,8 +50,10 @@ typedef struct {
 } acl_le_connection_interface_t;
 
 typedef struct {
-  void (*on_esco_connect_request)(const RawAddress, const types::ClassOfDevice);
-  void (*on_sco_connect_request)(const RawAddress, const types::ClassOfDevice);
+  void (*on_esco_connect_request)(const RawAddress&,
+                                  const types::ClassOfDevice&);
+  void (*on_sco_connect_request)(const RawAddress&,
+                                 const types::ClassOfDevice&);
   void (*on_disconnected)(uint16_t handle, tHCI_REASON reason);
 } acl_sco_connection_interface_t;
 
diff --git a/system/main/test/common/mock_stack_btm_sco.cc b/system/main/test/common/mock_stack_btm_sco.cc
index 10e40bf584..1542c5d9b2 100644
--- a/system/main/test/common/mock_stack_btm_sco.cc
+++ b/system/main/test/common/mock_stack_btm_sco.cc
@@ -101,7 +101,7 @@ void btm_sco_chk_pend_rolechange(uint16_t hci_handle) {
 void btm_sco_chk_pend_unpark(tHCI_STATUS hci_status, uint16_t hci_handle) {
   mock_function_count_map[__func__]++;
 }
-void btm_sco_conn_req(const RawAddress& bda, DEV_CLASS dev_class,
+void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS& dev_class,
                       uint8_t link_type) {
   mock_function_count_map[__func__]++;
 }
@@ -113,11 +113,11 @@ void btm_sco_disc_chk_pend_for_modechange(uint16_t hci_handle) {
   mock_function_count_map[__func__]++;
 }
 void btm_sco_on_esco_connect_request(
-    const RawAddress bda, const bluetooth::types::ClassOfDevice cod) {
+    const RawAddress& bda, const bluetooth::types::ClassOfDevice& cod) {
   mock_function_count_map[__func__]++;
 }
-void btm_sco_on_sco_connect_request(const RawAddress bda,
-                                    const bluetooth::types::ClassOfDevice cod) {
+void btm_sco_on_sco_connect_request(
+    const RawAddress& bda, const bluetooth::types::ClassOfDevice& cod) {
   mock_function_count_map[__func__]++;
 }
 void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason) {
diff --git a/system/stack/btm/btm_sco.cc b/system/stack/btm/btm_sco.cc
index fa436c6be4..5d0f376be9 100644
--- a/system/stack/btm/btm_sco.cc
+++ b/system/stack/btm/btm_sco.cc
@@ -588,7 +588,7 @@ void btm_sco_disc_chk_pend_for_modechange(uint16_t hci_handle) {
  * Returns          void
  *
  ******************************************************************************/
-void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS dev_class,
+void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS& dev_class,
                       uint8_t link_type) {
   tSCO_CB* p_sco = &btm_cb.sco_cb;
   tSCO_CONN* p = &p_sco->sco_db[0];
@@ -877,14 +877,14 @@ bool btm_sco_removed(uint16_t hci_handle, tHCI_REASON reason) {
 }
 
 void btm_sco_on_esco_connect_request(
-    const RawAddress bda, const bluetooth::types::ClassOfDevice cod) {
+    const RawAddress& bda, const bluetooth::types::ClassOfDevice& cod) {
   LOG_DEBUG("Remote ESCO connect request remote:%s cod:%s",
             PRIVATE_ADDRESS(bda), cod.ToString().c_str());
   btm_sco_conn_req(bda, cod.cod, BTM_LINK_TYPE_ESCO);
 }
 
-void btm_sco_on_sco_connect_request(const RawAddress bda,
-                                    const bluetooth::types::ClassOfDevice cod) {
+void btm_sco_on_sco_connect_request(
+    const RawAddress& bda, const bluetooth::types::ClassOfDevice& cod) {
   LOG_DEBUG("Remote SCO connect request remote:%s cod:%s", PRIVATE_ADDRESS(bda),
             cod.ToString().c_str());
   btm_sco_conn_req(bda, cod.cod, BTM_LINK_TYPE_SCO);
diff --git a/system/stack/include/sco_hci_link_interface.h b/system/stack/include/sco_hci_link_interface.h
index 5b4c17477a..9054c4025c 100644
--- a/system/stack/include/sco_hci_link_interface.h
+++ b/system/stack/include/sco_hci_link_interface.h
@@ -31,14 +31,14 @@ extern void btm_esco_proc_conn_chg(uint8_t status, uint16_t handle,
 extern bool btm_is_sco_active(uint16_t handle);
 extern void btm_sco_chk_pend_unpark(tHCI_STATUS hci_status,
                                     uint16_t hci_handle);
-extern void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS dev_class,
+extern void btm_sco_conn_req(const RawAddress& bda, const DEV_CLASS& dev_class,
                              uint8_t link_type);
 extern void btm_sco_connected(tHCI_STATUS hci_status, const RawAddress& bda,
                               uint16_t hci_handle, tBTM_ESCO_DATA* p_esco_data);
 extern bool btm_sco_removed(uint16_t hci_handle, tHCI_REASON reason);
 
 void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason);
-void btm_sco_on_esco_connect_request(const RawAddress,
-                                     const bluetooth::types::ClassOfDevice);
-void btm_sco_on_sco_connect_request(const RawAddress,
-                                    const bluetooth::types::ClassOfDevice);
+void btm_sco_on_esco_connect_request(const RawAddress&,
+                                     const bluetooth::types::ClassOfDevice&);
+void btm_sco_on_sco_connect_request(const RawAddress&,
+                                    const bluetooth::types::ClassOfDevice&);