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

Commit d6370b71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am:... 

Merge "Legacy pairing: Reject device with same BD_ADDR" into oc-mr1-dev am: 710c2b8a am: b37fb6c8

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bt/+/13180128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f8757a8d5049f25b5bade4b5952654ed2317acd
parents 809735f6 b37fb6c8

system/stack/btm/btm_sec.cc

+7 −0
Original line number Diff line number Diff line
@@ -4879,6 +4879,13 @@ void btm_sec_pin_code_request(const RawAddress& p_bda) { 
  VLOG(2) << __func__ << " BDA: " << p_bda

          << " state: " << btm_pair_state_descr(btm_cb.pairing_state);



  RawAddress local_bd_addr = *controller_get_interface()->get_address();

  if (p_bda == local_bd_addr) {

    android_errorWriteLog(0x534e4554, "174626251");

    btsnd_hcic_pin_code_neg_reply(p_bda);

    return;

  }



  if (btm_cb.pairing_state != BTM_PAIR_STATE_IDLE) {

    if ((p_bda == btm_cb.pairing_bda) &&

        (btm_cb.pairing_state == BTM_PAIR_STATE_WAIT_AUTH_COMPLETE)) {