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

Commit 7b682316 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[Invisalign2] Macro Rename SMP_PAIR_FLAGS_CMD_CONFIRM ->... 

Merge "[Invisalign2] Macro Rename SMP_PAIR_FLAGS_CMD_CONFIRM -> SMP_PAIR_FLAGS_CMD_CONFIRM_RCVD" into main am: 78e26955 am: b6c25d51

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



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

system/stack/smp/smp_act.cc

+2 −2
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ void smp_proc_confirm(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
    }

  }



  p_cb->flags |= SMP_PAIR_FLAGS_CMD_CONFIRM;

  p_cb->flags |= SMP_PAIR_FLAGS_CMD_CONFIRM_RCVD;

}



/*******************************************************************************
@@ -1143,7 +1143,7 @@ void smp_proc_sl_key(tSMP_CB* p_cb, tSMP_INT_DATA* p_data) { 
  } else if (key_type == SMP_KEY_TYPE_CFM) {

    smp_set_state(SMP_STATE_WAIT_CONFIRM);



    if (p_cb->flags & SMP_PAIR_FLAGS_CMD_CONFIRM)

    if (p_cb->flags & SMP_PAIR_FLAGS_CMD_CONFIRM_RCVD)

      smp_sm_event(p_cb, SMP_CONFIRM_EVT, NULL);

  }

}

system/stack/smp/smp_int.h

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ typedef union { 
/* internal status mask */

#define SMP_PAIR_FLAGS_WE_STARTED_DD (1)

#define SMP_PAIR_FLAGS_PEER_STARTED_DD (1 << 1)

#define SMP_PAIR_FLAGS_CMD_CONFIRM (1 << SMP_OPCODE_CONFIRM) /* 1 << 3 */

#define SMP_PAIR_FLAGS_CMD_CONFIRM_RCVD (1 << SMP_OPCODE_CONFIRM) /* 1 << 3 */

#define SMP_PAIR_FLAG_ENC_AFTER_PAIR (1 << 4)

#define SMP_PAIR_FLAG_HAVE_PEER_DHK_CHK \

  (1 << 5) /* used on peripheral to resolve race condition */