Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec38a748 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[Invisalign2] Remove result in btm_ble_start_sec_check" into main am: c2c2f2cb 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2854902



Change-Id: Ib3c878484d67419629453b96b1bd13aecd1dd0d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5bd26f3 c2c2f2cb

system/stack/btm/btm_ble_sec.cc

+1 −3
Original line number Diff line number Diff line
@@ -752,13 +752,11 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 
      is_originator, bd_addr, p_serv_rec->security_flags);



  tBTM_BLE_SEC_ACT ble_sec_act = BTM_BLE_SEC_NONE;

  tL2CAP_LE_RESULT_CODE result = L2CAP_LE_RESULT_CONN_OK;



  switch (sec_act) {

    case BTM_SEC_OK:

      LOG_DEBUG("Security met");

      p_callback(&bd_addr, BT_TRANSPORT_LE, p_ref_data, BTM_SUCCESS);

      result = L2CAP_LE_RESULT_CONN_OK;

      break;



    case BTM_SEC_ENCRYPT:
@@ -782,7 +780,7 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 
  }



  if (ble_sec_act == BTM_BLE_SEC_NONE && sec_act != BTM_SEC_ENC_PENDING) {

    return result;

    return L2CAP_LE_RESULT_CONN_OK;

  }



  l2cble_update_sec_act(bd_addr, sec_act);