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

Commit c199f2dc authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

stack::sec Move old_sec_state to where it is changed am: a27448a8 am: bcf82c3f 

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



Change-Id: I7e8fa54a7c9053a3570dbd661803da10525d3844
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86f8f1a2 bcf82c3f

system/stack/btm/btm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -2328,7 +2328,6 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
    return;

  }



  uint8_t old_sec_state = p_dev_rec->sec_rec.sec_state;

  if (status == HCI_SUCCESS) {

    log::debug(

        "Remote read request complete for known device pairing_state:{} "
@@ -2354,6 +2353,7 @@ void btm_sec_rmt_name_request_complete(const RawAddress* p_bd_addr, 
    p_dev_rec->sec_bd_name[0] = 0;

  }



  uint8_t old_sec_state = p_dev_rec->sec_rec.sec_state;

  if (p_dev_rec->sec_rec.sec_state == BTM_SEC_STATE_GETTING_NAME)

    p_dev_rec->sec_rec.sec_state = BTM_SEC_STATE_IDLE;