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

Commit 0316a6a6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "stack::sec::btm_sec_mx_access_request Use proper type tBT_TRANSPORT"... 

Merge "stack::sec::btm_sec_mx_access_request Use proper type tBT_TRANSPORT" into main am: 588b6762 am: d29fa17b

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



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

system/stack/btm/btm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -1688,7 +1688,7 @@ tBTM_STATUS btm_sec_mx_access_request(const RawAddress& bd_addr, bool is_origina 
                                      void* p_ref_data) {

  tBTM_SEC_DEV_REC* p_dev_rec;

  tBTM_STATUS rc;

  bool transport = false; /* should check PSM range in LE connection oriented

  tBT_TRANSPORT transport = BT_TRANSPORT_AUTO; /* should check PSM range in LE connection oriented

                                                  L2CAP connection */

  log::debug("Multiplex access request device:{}", bd_addr);