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

Commit 471fb228 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "unittest:net_test_bta_security Use common LogMsg method" am: 071fbef0 am: 7a824734 

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



Change-Id: If1f56c4f3dfdd86ed7dd2e710c5176c5bd65d7b7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 98e72aa9 7a824734

system/bta/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ cc_test { 
	":TestMockDevice",

	":TestMockStack",

	":TestMockBtif",

        ":TestCommonLogMsg",

        "test/bta_hf_client_security_test.cc",

    ],

    shared_libs: [

system/bta/test/bta_hf_client_security_test.cc

+0 −4
Original line number Diff line number Diff line
@@ -38,10 +38,6 @@ namespace { 
const RawAddress bdaddr1({0x11, 0x22, 0x33, 0x44, 0x55, 0x66});

}  // namespace



// TODO(jpawlowski): there is some weird dependency issue in tests, and the

// tests here fail to compile without this definition.

void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...) {}



class BtaHfClientSecurityTest : public testing::Test {

 protected:

  void SetUp() override {