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

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

Merge "legacy: Use proper types tSECURITY_STATE" am: 83ed3da1 am: e2600680 

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

Change-Id: I52909e5b29c570d1357cd5c1e52fe0858fb44940
parents fd564302 e2600680

system/stack/btm/btm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -2988,7 +2988,7 @@ static void btm_sec_auth_collision(uint16_t handle) { 
      /* We will restart authentication after timeout */

      if (p_dev_rec->sec_state == BTM_SEC_STATE_AUTHENTICATING ||

          p_dev_rec->sec_state == BTM_SEC_STATE_ENCRYPTING)

        p_dev_rec->sec_state = 0;

        p_dev_rec->sec_state = BTM_SEC_STATE_IDLE;



      btm_cb.p_collided_dev_rec = p_dev_rec;

      alarm_set_on_mloop(btm_cb.sec_collision_timer, BT_1SEC_TIMEOUT_MS,

system/stack/btm/security_device_record.h

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ struct tBTM_SEC_DEV_REC { 
  tBTM_BD_NAME sec_bd_name; /* User friendly name of the device. (may be

                               truncated to save space in dev_rec table) */



  uint8_t sec_state;          /* Operating state                    */

  tSECURITY_STATE sec_state; /* Operating state                    */

  bool is_security_state_idle() const {

    return sec_state == BTM_SEC_STATE_IDLE;

  }