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

Commit c53d6e10 authored by Johanna Ye's avatar Johanna Ye Committed by Automerger Merge Worker
Browse files

Merge "Add logging message to indicate collision with previous pending... 

Merge "Add logging message to indicate collision with previous pending connection from the same remote device." am: 0f37ba04 am: dc8d78aa

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

Change-Id: I279dad28d75b78f0c9dd6a259a4a18c4e87739f3
parents 3832dcad dc8d78aa

system/btif/src/btif_hh.cc

+5 −1
Original line number Diff line number Diff line
@@ -1242,9 +1242,13 @@ static bt_status_t connect(RawAddress* bd_addr) { 
    btif_transfer_context(btif_hh_handle_evt, BTIF_HH_CONNECT_REQ_EVT,

                          (char*)bd_addr, sizeof(RawAddress), NULL);

    return BT_STATUS_SUCCESS;

  } else

  } else if ((btif_hh_cb.pending_conn_address == *bd_addr) &&

       (btif_hh_cb.status == BTIF_HH_DEV_CONNECTING)) {

    LOG(INFO) << __func__ << ": already connecting " << *bd_addr;

    return BT_STATUS_BUSY;

  }

  return BT_STATUS_FAIL;

}



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

 *