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

Commit 714f7375 authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Reset LMP in the reset command" am: c028d9a6 am: 2f28fa2d am: 6526be6b 

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



Change-Id: I809c059fc24deb419dffe56552e9c610ea1994f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc5a7016 6526be6b

tools/rootcanal/model/controller/link_layer_controller.cc

+5 −2
Original line number Original line Diff line number Diff line
@@ -192,7 +192,7 @@ LinkLayerController::LinkLayerController(const Address& address, 
    : address_(address),

    : address_(address),

      properties_(properties),

      properties_(properties),

      lm_(nullptr, link_manager_destroy) {

      lm_(nullptr, link_manager_destroy) {

  auto ops = (struct LinkManagerOps){

  ops_ = {

      .user_pointer = this,

      .user_pointer = this,

      .get_handle =

      .get_handle =

          [](void* user, const uint8_t(*address)[6]) {

          [](void* user, const uint8_t(*address)[6]) {
@@ -245,7 +245,7 @@ LinkLayerController::LinkLayerController(const Address& address, 
                source, dest, std::move(payload)));

                source, dest, std::move(payload)));

          }};

          }};





  lm_.reset(link_manager_create(ops));

  lm_.reset(link_manager_create(ops_));

}

}

#else

#else

LinkLayerController::LinkLayerController(const Address& address,

LinkLayerController::LinkLayerController(const Address& address,
@@ -4001,6 +4001,9 @@ void LinkLayerController::Reset() { 
  last_inquiry_ = steady_clock::now();

  last_inquiry_ = steady_clock::now();

  page_scan_enable_ = false;

  page_scan_enable_ = false;

  inquiry_scan_enable_ = false;

  inquiry_scan_enable_ = false;

#ifdef ROOTCANAL_LMP

  lm_.reset(link_manager_create(ops_));

#endif

}

}





void LinkLayerController::StartInquiry(milliseconds timeout) {

void LinkLayerController::StartInquiry(milliseconds timeout) {

tools/rootcanal/model/controller/link_layer_controller.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
extern "C" {

extern "C" {

struct LinkManager;

struct LinkManager;

}

}

#include "lmp.h"

#else

#else

#include "security_manager.h"

#include "security_manager.h"

#endif /* ROOTCANAL_LMP */

#endif /* ROOTCANAL_LMP */
@@ -789,6 +790,7 @@ class LinkLayerController { 
  // Classic state

  // Classic state

#ifdef ROOTCANAL_LMP

#ifdef ROOTCANAL_LMP

  std::unique_ptr<const LinkManager, void (*)(const LinkManager*)> lm_;

  std::unique_ptr<const LinkManager, void (*)(const LinkManager*)> lm_;

  struct LinkManagerOps ops_;

#else

#else

  SecurityManager security_manager_{10};

  SecurityManager security_manager_{10};

#endif /* ROOTCANAL_LMP */

#endif /* ROOTCANAL_LMP */