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

Commit a88736e0 authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge changes Id97aa338,Iacefcd04,I91ce850e into tm-qpr-dev am: 3d8ff7ed 

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



Change-Id: Iee0a53c06c147a67f637b714ae2bc77a67c2a52c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 068dfc5d 3d8ff7ed

system/stack/smp/smp_l2c.cc

+20 −2
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 


#define LOG_TAG "bluetooth"



#include <base/logging.h>

#include <string.h>



#include "bt_target.h"
@@ -35,11 +36,10 @@ 
#include "osi/include/log.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "smp_int.h"

#include "stack/btm/btm_dev.h"

#include "stack/include/bt_hdr.h"

#include "types/raw_address.h"



#include <base/logging.h>



static void smp_connect_callback(uint16_t channel, const RawAddress& bd_addr,

                                 bool connected, uint16_t reason,

                                 tBT_TRANSPORT transport);
@@ -249,6 +249,24 @@ static void smp_br_connect_callback(uint16_t channel, const RawAddress& bd_addr, 


  if (bd_addr != p_cb->pairing_bda) return;



  /* Check if we already finished SMP pairing over LE, and are waiting to

   * check if other side returns some errors. Connection/disconnection on

   * Classic transport shouldn't impact that.

   */

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(p_cb->pairing_bda);

  if (smp_get_state() == SMP_STATE_BOND_PENDING &&

      (p_dev_rec && p_dev_rec->is_link_key_known()) &&

      alarm_is_scheduled(p_cb->delayed_auth_timer_ent)) {

    /* If we were to not return here, we would reset SMP control block, and

     * delayed_auth_timer_ent would never be executed. Even though we stored all

     * keys, stack would consider device as not bonded. It would reappear after

     * stack restart, when we re-read record from storage. Service discovery

     * would stay broken.

     */

    LOG_INFO("Classic event after CTKD on LE transport");

    return;

  }



  if (connected) {

    if (!p_cb->connect_initialized) {

      p_cb->connect_initialized = true;