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

Commit 996e18d4 authored by Chris Manton's avatar Chris Manton
Browse files

Use tBTM_SEC_DEV_REC::IsLocallyInitiated 

Towards encapsulated code

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

Change-Id: I36da3481eb54ce016df021fa6d24f3f82555ace8
parent 7d3fd0d3

system/stack/btm/btm_sec.cc

+8 −8
Original line number Diff line number Diff line
@@ -3699,7 +3699,7 @@ void btm_sec_disconnected(uint16_t handle, tHCI_STATUS reason) { 


    // This is for chips that don't support being in connected and advertising

    // state at same time.

    if (!p_dev_rec->is_originator) {

    if (!p_dev_rec->IsLocallyInitiated()) {

      btm_ble_advertiser_notify_terminated_legacy(HCI_SUCCESS, handle);

    }

  } else {
@@ -4091,7 +4091,7 @@ void btm_sec_pin_code_request(uint8_t* p_event) { 
           /*  the only thing we can do here is to shut it up.  Normally we will

              be originator */

           /*  for keyboard bonding */

           || (!p_dev_rec->is_originator &&

           || (!p_dev_rec->IsLocallyInitiated() &&

               ((p_dev_rec->dev_class[1] & BTM_COD_MAJOR_CLASS_MASK) ==

                BTM_COD_MAJOR_PERIPHERAL) &&

               (p_dev_rec->dev_class[2] & BTM_COD_MINOR_KEYBOARD))) {
@@ -4207,12 +4207,12 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
  /* If connection is not authenticated and authentication is required */

  /* start authentication and return PENDING to the caller */

  if ((((!(p_dev_rec->sec_flags & BTM_SEC_AUTHENTICATED)) &&

        ((p_dev_rec->is_originator &&

        ((p_dev_rec->IsLocallyInitiated() &&

          (p_dev_rec->security_required & BTM_SEC_OUT_AUTHENTICATE)) ||

         (!p_dev_rec->is_originator &&

         (!p_dev_rec->IsLocallyInitiated() &&

          (p_dev_rec->security_required & BTM_SEC_IN_AUTHENTICATE)))) ||

       (!(p_dev_rec->sec_flags & BTM_SEC_16_DIGIT_PIN_AUTHED) &&

        (!p_dev_rec->is_originator &&

        (!p_dev_rec->IsLocallyInitiated() &&

         (p_dev_rec->security_required & BTM_SEC_IN_MIN_16_DIGIT_PIN)))) &&

      (p_dev_rec->hci_handle != HCI_INVALID_HANDLE)) {

    /*
@@ -4237,7 +4237,7 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
     */

    if ((p_dev_rec->sec_flags & BTM_SEC_LINK_KEY_KNOWN) &&

        (!(p_dev_rec->sec_flags & BTM_SEC_16_DIGIT_PIN_AUTHED) &&

         (!p_dev_rec->is_originator &&

         (!p_dev_rec->IsLocallyInitiated() &&

          (p_dev_rec->security_required & BTM_SEC_IN_MIN_16_DIGIT_PIN)))) {

      p_dev_rec->sec_flags &=

          ~(BTM_SEC_LINK_KEY_KNOWN | BTM_SEC_LINK_KEY_AUTHED |
@@ -4251,9 +4251,9 @@ tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec) { 
  /* If connection is not encrypted and encryption is required */

  /* start encryption and return PENDING to the caller */

  if (!(p_dev_rec->sec_flags & BTM_SEC_ENCRYPTED) &&

      ((p_dev_rec->is_originator &&

      ((p_dev_rec->IsLocallyInitiated() &&

        (p_dev_rec->security_required & BTM_SEC_OUT_ENCRYPT)) ||

       (!p_dev_rec->is_originator &&

       (!p_dev_rec->IsLocallyInitiated() &&

        (p_dev_rec->security_required & BTM_SEC_IN_ENCRYPT))) &&

      (p_dev_rec->hci_handle != HCI_INVALID_HANDLE)) {

    BTM_TRACE_EVENT("Security Manager: Start encryption");