| commit | 9f1c709363393029c866bf17edafb1c7b2cf8689 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Aug 28 21:35:22 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 28 21:35:22 2020 +0000 |
| tree | 59510c04ce14ca4edfe69dd61696a5600255d443 | |
| parent | c6879c3fe5833b5198255126342185e45929c577 [diff] | |
| parent | 10c706cd5dcbbf34c92a4d64eca6d29931ffd8d6 [diff] |
Merge "Send a response to an smp security request depending on the callback event" into oc-dev
diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc index b7c2bd2..f94f81f 100644 --- a/stack/btm/btm_sec.cc +++ b/stack/btm/btm_sec.cc
@@ -4696,6 +4696,7 @@ tBTA_DM_MSG p_data; memcpy(p_data.remove_dev.bd_addr, p_dev_rec->bd_addr, BD_ADDR_LEN); bta_dm_remove_device(&p_data); + return; } if (p_dev_rec->sec_state == BTM_SEC_STATE_DISCONNECTING_BOTH) {