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

Commit 957d589f authored by Zach Johnson's avatar Zach Johnson
Browse files

BTM_SEC_OUT_FLAGS used to include authorized 

but now it doesn't so we only need the condition
above this one

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ifad48ac18f92e9922eaa9fe04fe66ca04bbd80b2
parent 839f7754

system/stack/btm/btm_sec.cc

+1 −20
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ tBTM_SEC_DEV_REC* btm_sec_find_dev_by_sec_state(uint8_t state); 


static bool btm_dev_authenticated(tBTM_SEC_DEV_REC* p_dev_rec);

static bool btm_dev_encrypted(tBTM_SEC_DEV_REC* p_dev_rec);

static bool btm_dev_authorized(tBTM_SEC_DEV_REC* p_dev_rec);

static uint16_t btm_sec_set_serv_level4_flags(uint16_t cur_security,

                                              bool is_originator);
@@ -152,22 +151,6 @@ static bool btm_dev_encrypted(tBTM_SEC_DEV_REC* p_dev_rec) { 
  return (false);

}



/*******************************************************************************

 *

 * Function         btm_dev_authorized

 *

 * Description      check device is authorized

 *

 * Returns          bool    true or false

 *

 ******************************************************************************/

static bool btm_dev_authorized(tBTM_SEC_DEV_REC* p_dev_rec) {

  if (p_dev_rec->sec_flags & BTM_SEC_AUTHORIZED) {

    return (true);

  }

  return (false);

}



/*******************************************************************************

 *

 * Function         btm_dev_16_digit_authenticated
@@ -1657,9 +1640,7 @@ tBTM_STATUS btm_sec_l2cap_access_req(const RawAddress& bd_addr, uint16_t psm, 
              btm_dev_authenticated(p_dev_rec))) ||

            ((((security_required & BTM_SEC_OUT_FLAGS) ==

               (BTM_SEC_OUT_AUTHENTICATE | BTM_SEC_OUT_ENCRYPT)) &&

              btm_dev_encrypted(p_dev_rec))) ||

            ((((security_required & BTM_SEC_OUT_FLAGS) == BTM_SEC_OUT_FLAGS) &&

              btm_dev_authorized(p_dev_rec) && btm_dev_encrypted(p_dev_rec)))) {

              btm_dev_encrypted(p_dev_rec)))) {

          rc = BTM_SUCCESS;

        }

      } else {