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

Commit 4174e2a0 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge changes I2d4188ed,Ic66482e1 into main 

* changes:
  testing: Update mock_stack_btm_sec
  [Invisalign] Remove unused smp_int.h
parents 54ba989c 85a4571e

system/stack/btm/btm_sec.cc

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ 
#include "stack/include/btu.h"  // do_in_main_thread

#include "stack/include/l2cap_security_interface.h"

#include "stack/include/stack_metrics_logging.h"

#include "stack/smp/smp_int.h"

#include "types/raw_address.h"



namespace {

system/stack/test/stack_acl_test.cc

+1 −6
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include "stack/include/hci_error_code.h"

#include "test/common/mock_functions.h"

#include "test/mock/mock_main_shim_acl_api.h"

#include "test/mock/mock_stack_btm_sec.h"

#include "types/ble_address_with_type.h"

#include "types/hci_role.h"

#include "types/raw_address.h"
@@ -53,12 +54,6 @@ std::set<const RawAddress> copy_of_connected_with_both_public_and_random_set(); 
}  // namespace testing

}  // namespace bluetooth



void BTM_update_version_info(const RawAddress& bd_addr,

                             const remote_version_info& remote_version_info) {}



void btm_sec_role_changed(tHCI_STATUS hci_status, const RawAddress& bd_addr,

                          tHCI_ROLE new_role) {}



class StackAclTest : public testing::Test {

 protected:

  void SetUp() override {

system/test/mock/mock_stack_btm_sec.cc

+318 −148

File changed.

Preview size limit exceeded, changes collapsed.

system/test/mock/mock_stack_btm_sec.h

+886 −5

File changed.

Preview size limit exceeded, changes collapsed.