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

Commit 8405c43c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: test: Clean up inclusion for mock main_shim_l2cap_api" am: 78dc4908 

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

Change-Id: Id075ae12b89f7d454e9d9eb4a9559fdeb7630682
parents b45ca021 78dc4908

system/test/mock/mock_main_shim_l2cap_api.cc

+2 −6
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
 *  mockcify.pl ver 0.2

 */



#include "test/mock/mock_main_shim_l2cap_api.h"



#include <cstdint>

#include <functional>

#include <map>
@@ -29,7 +31,6 @@ 
extern std::map<std::string, int> mock_function_count_map;



// Mock include file to share data between tests and mock

#include "test/mock/mock_main_shim_l2cap_api.h"



// Mocked compile conditionals, if any

#ifndef UNUSED_ATTR
@@ -164,11 +165,6 @@ bool bluetooth::shim::L2CA_SetIdleTimeoutByBdAddr(const RawAddress& bd_addr, 
  return test::mock::main_shim_l2cap_api::L2CA_SetIdleTimeoutByBdAddr(

      bd_addr, timeout, transport);

}

bool bluetooth::shim::L2CA_SetAclPriority(uint16_t handle, bool high_priority) {

  mock_function_count_map[__func__]++;

  return test::mock::main_shim_l2cap_api::L2CA_SetAclPriority(handle,

                                                              high_priority);

}

bool bluetooth::shim::L2CA_SetAclPriority(const RawAddress& bd_addr,

                                          tL2CAP_PRIORITY priority) {

  mock_function_count_map[__func__]++;

system/test/mock/mock_main_shim_l2cap_api.h

+0 −4
Original line number Diff line number Diff line
@@ -40,16 +40,12 @@ extern std::map<std::string, int> mock_function_count_map; 
#include <unordered_map>

#include <unordered_set>

#include "bta/include/bta_dm_acl.h"

#include "gd/l2cap/classic/l2cap_classic_module.h"

#include "gd/l2cap/le/l2cap_le_module.h"

#include "gd/os/log.h"

#include "gd/os/queue.h"

#include "main/shim/acl_api.h"

#include "main/shim/btm.h"

#include "main/shim/entry.h"

#include "main/shim/helpers.h"

#include "main/shim/l2c_api.h"

#include "main/shim/stack.h"

#include "osi/include/allocator.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_sec.h"