commit 76716fb8a56ba11b9deb7032ab9df6cf071ad9c5
author Hui Peng <phui@google.com> Tue Nov 07 03:05:28 2023 +0000
committer Hui Peng <phui@google.com> Tue Nov 07 18:23:45 2023 +0000
tree 233ba82532b7d0239984b2c7ce652fa2100ca149
parent 9af8868855f6bd14933370ab34d982b790d24f4e

[Invisalign2] Use btm_find_or_alloc_dev in btm_sec_connect_req

Bug: 301661850
Test: m com.android.btservices
Change-Id: I39ad73b83fdd4fa2eae840feb868fba7146cdd5a

system/stack/btm/btm_sec.cc

diff --git a/system/stack/btm/btm_sec.cc b/system/stack/btm/btm_sec.cc
index cd707ce..9a43b71 100644
--- a/system/stack/btm/btm_sec.cc
+++ b/system/stack/btm/btm_sec.cc
@@ -2060,7 +2060,7 @@
  *
  ******************************************************************************/
 void btm_sec_conn_req(const RawAddress& bda, uint8_t* dc) {
-  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bda);
+  tBTM_SEC_DEV_REC* p_dev_rec = nullptr;
 
   /* Some device may request a connection before we are done with the HCI_Reset
    * sequence */
@@ -2086,10 +2086,7 @@
   btm_sec_cb.connecting_bda = bda;
   memcpy(btm_sec_cb.connecting_dc, dc, DEV_CLASS_LEN);
 
-  if (!p_dev_rec) {
-    /* accept the connection -> allocate a device record */
-    p_dev_rec = btm_sec_alloc_dev(bda);
-  }
+  p_dev_rec = btm_find_or_alloc_dev(bda);
   p_dev_rec->sm4 |= BTM_SM4_CONN_PEND;
 }