From: Chris Manton <cmanton@google.com>
Date: Thu, 14 Jan 2021 21:59:33 +0000 (-0800)
Subject: Streamline stack/btm/btm_sec::btm_sec_disconnect
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e16288ff2da4082f354e168b59ec718a64035a8d;p=android-x86%2Fsystem-bt.git

Streamline stack/btm/btm_sec::btm_sec_disconnect

Towards readable code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run

Change-Id: I69339757cfea9e9b01587b788a10510de25fc00f
---

diff --git a/stack/btm/btm_sec.cc b/stack/btm/btm_sec.cc
index ed70d449d..486e99bfd 100644
--- a/stack/btm/btm_sec.cc
+++ b/stack/btm/btm_sec.cc
@@ -3630,11 +3630,8 @@ tBTM_STATUS btm_sec_disconnect(uint16_t handle, tHCI_STATUS reason) {
 }
 
 void btm_sec_disconnected(uint16_t handle, tHCI_STATUS reason) {
-  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle);
   uint8_t old_pairing_flags = btm_cb.pairing_flags;
   tHCI_STATUS result = HCI_ERR_AUTH_FAILURE;
-  tBTM_SEC_CALLBACK* p_callback = NULL;
-  tBT_TRANSPORT transport = BT_TRANSPORT_BR_EDR;
 
   if ((reason != HCI_ERR_CONN_CAUSE_LOCAL_HOST) &&
       (reason != HCI_ERR_PEER_USER)) {
@@ -3645,9 +3642,13 @@ void btm_sec_disconnected(uint16_t handle, tHCI_STATUS reason) {
 
   btm_acl_resubmit_page();
 
-  if (!p_dev_rec) return;
+  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev_by_handle(handle);
+  if (!p_dev_rec) {
+    LOG_WARN("Unable to find device record");
+    return;
+  }
 
-  transport =
+  tBT_TRANSPORT transport =
       (handle == p_dev_rec->hci_handle) ? BT_TRANSPORT_BR_EDR : BT_TRANSPORT_LE;
 
   /* clear unused flags */
@@ -3739,7 +3740,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_STATUS reason) {
   p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;
   p_dev_rec->security_required = BTM_SEC_NONE;
 
-  p_callback = p_dev_rec->p_callback;
+  tBTM_SEC_CALLBACK* p_callback = p_dev_rec->p_callback;
 
   /* if security is pending, send callback to clean up the security state */
   if (p_callback) {