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

Commit 92eadc19 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-1738738-LHXSQXGGCL" am: bca79617 

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

Change-Id: I37d8836ccff5a69512a730ea6af8f9efe5ef6440
parents a92bb3cd bca79617

system/bta/test/bta_dm_test.cc

+4 −16
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "bta/include/bta_hf_client_api.h"

#include "bta/test/common/fake_osi.h"

#include "common/message_loop_thread.h"

#include "test/mock/mock_stack_acl.h"



std::map<std::string, int> mock_function_count_map;
@@ -75,37 +74,28 @@ TEST_F(BtaDmTest, disable_no_acl_links) { 
  ASSERT_TRUE(!bta_dm_cb.disabling);

}



extern uint16_t mock_stack_acl_num_links;

TEST_F(BtaDmTest, disable_first_pass_with_acl_links) {

  uint16_t links_up = 1;

  test::mock::stack_acl::BTM_GetNumAclLinks.body = [&links_up]() {

    return links_up;

  };

  bta_dm_cb.disabling = true;

  // ACL link is open

  bta_dm_cb.device_list.count = 1;

  mock_stack_acl_num_links = bta_dm_cb.device_list.count = 1;



  bta_dm_disable();              // Waiting for all ACL connections to drain

  mock_stack_acl_num_links = 0;  // ACL link has closed

  ASSERT_EQ(1, mock_function_count_map["alarm_set_on_mloop"]);

  ASSERT_EQ(0, mock_function_count_map["BTIF_dm_disable"]);



  links_up = 0;

  // First disable pass

  fake_osi_alarm_set_on_mloop_.cb(fake_osi_alarm_set_on_mloop_.data);

  ASSERT_EQ(1, mock_function_count_map["alarm_set_on_mloop"]);

  ASSERT_EQ(1, mock_function_count_map["BTIF_dm_disable"]);

  ASSERT_TRUE(!bta_dm_cb.disabling);



  test::mock::stack_acl::BTM_GetNumAclLinks = {};

}



TEST_F(BtaDmTest, disable_second_pass_with_acl_links) {

  uint16_t links_up = 1;

  test::mock::stack_acl::BTM_GetNumAclLinks.body = [&links_up]() {

    return links_up;

  };

  bta_dm_cb.disabling = true;

  // ACL link is open

  bta_dm_cb.device_list.count = 1;

  mock_stack_acl_num_links = bta_dm_cb.device_list.count = 1;



  bta_dm_disable();  // Waiting for all ACL connections to drain

  ASSERT_EQ(1, mock_function_count_map["alarm_set_on_mloop"]);
@@ -121,6 +111,4 @@ TEST_F(BtaDmTest, disable_second_pass_with_acl_links) { 
  fake_osi_alarm_set_on_mloop_.cb(fake_osi_alarm_set_on_mloop_.data);

  ASSERT_EQ(1, mock_function_count_map["BTIF_dm_disable"]);

  ASSERT_TRUE(!bta_dm_cb.disabling);



  test::mock::stack_acl::BTM_GetNumAclLinks = {};

}

system/btif/include/btif_a2dp.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <stdbool.h>



#include "bta/include/bta_av_api.h"

#include "bta_av_api.h"



// Process 'idle' request from the BTIF state machine during initialization.

void btif_a2dp_on_idle(void);

system/osi/test/properties_test.cc

+1 −5
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ TEST_F(PropertiesTest, test_default_value) { 
}



TEST_F(PropertiesTest, test_successfull_set_and_get_value) {

#if !defined(OS_GENERIC)

  char value[PROPERTY_VALUE_MAX] = "nothing_interesting";

  int ret = osi_property_set("very.useful.set.test", value);

  ASSERT_EQ(0, ret);
@@ -39,7 +38,6 @@ TEST_F(PropertiesTest, test_successfull_set_and_get_value) { 
  char received[PROPERTY_VALUE_MAX];

  osi_property_get("very.useful.set.test", received, NULL);

  ASSERT_STREQ(received, "nothing_interesting");

#endif

}



TEST_F(PropertiesTest, test_default_value_int32) {
@@ -49,12 +47,10 @@ TEST_F(PropertiesTest, test_default_value_int32) { 
}



TEST_F(PropertiesTest, test_successfull_set_and_get_value_int32) {

#if !defined(OS_GENERIC)

  char value[PROPERTY_VALUE_MAX] = "42";

  int ret = osi_property_set("very.useful.set.test", value);

  ASSERT_EQ(0, ret);



  int32_t received = osi_property_get_int32("very.useful.set.test", 84);

  ASSERT_EQ(received, 42);

#endif

}
 
 No newline at end of file

system/stack/Android.bp

+12 −33
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ cc_test { 
cc_test {

    name: "net_test_stack_smp",

    defaults: ["fluoride_defaults"],

    host_supported: true,

    test_suites: ["device-tests"],

    local_include_dirs: [

        "include",
@@ -356,39 +355,19 @@ cc_test { 
        "packages/modules/Bluetooth/system/utils/include",

    ],

    srcs: crypto_toolbox_srcs + [

        ":TestCommonMainHandler",

        ":TestMockBtif",

        ":TestMockCommon",

        ":TestMockDevice",

        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackL2cap",

        ":TestMockStackMetrics",

        "smp/smp_keys.cc",

        "smp/p_256_curvepara.cc",

        "smp/p_256_ecc_pp.cc",

        "smp/p_256_multprecision.cc",

        "smp/smp_act.cc",

        "smp/smp_api.cc",

        "smp/smp_br_main.cc",

        "smp/smp_keys.cc",

        "smp/smp_l2c.cc",

        "smp/smp_main.cc",

        "smp/smp_utils.cc",

        "test/crypto_toolbox_test.cc",

        "test/stack_smp_test.cc",

    ],

    generated_headers: [

        "BluetoothGeneratedBundlerSchema_h_bfbs",

        "BluetoothGeneratedDumpsysDataSchema_h",

        "BluetoothGeneratedDumpsysBundledSchema_h",

        "BluetoothGeneratedPackets_h",

    ],

    shared_libs: [

        "libcrypto",

        "libcutils",

        "libflatbuffers-cpp",

        "libcrypto",

    ],

    static_libs: [

        "liblog",
@@ -784,8 +763,8 @@ cc_test { 
        ":TestMockStackBtu",

        ":TestMockStackGap",

        ":TestMockStackGatt",

        ":TestMockStackL2cap",

        ":TestMockStackSmp",

        ":TestStackL2cap",

        "acl/acl.cc",

        "acl/ble_acl.cc",

        "acl/btm_acl.cc",
@@ -896,9 +875,9 @@ cc_test { 
        "packages/modules/Bluetooth/system/gd",

    ],

    srcs: crypto_toolbox_srcs + [

        ":TestMockStackL2cap",

        ":TestMockStackSdp",

        ":TestMockStackBtm",

        ":TestStackL2cap",

        ":TestStackSdp",

        ":TestStackBtm",

        ":TestStubLegacyTrace",

        "hid/hidd_api.cc",

        "hid/hidd_conn.cc",
@@ -956,10 +935,10 @@ cc_test { 
        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackL2cap",

        ":TestMockStackMetrics",

        ":TestMockStackSmp",

        ":TestStackBtm",

        ":TestStackL2cap",

        ":TestMockStackMetrics",

        "btu/btu_hcif.cc",

        "btu/btu_task.cc",

        "test/stack_btu_test.cc",
@@ -1016,11 +995,11 @@ cc_test { 
        ":TestMockLegacyHciCommands",

        ":TestMockMainShim",

        ":TestMockStackAcl",

        ":TestMockStackBtm",

        ":TestMockStackCryptotoolbox",

        ":TestMockStackL2cap",

        ":TestMockStackSdp",

        ":TestMockStackSmp",

        ":TestStackBtm",

        ":TestStackL2cap",

        ":TestStackSdp",

        "eatt/eatt.cc",

        "gatt/att_protocol.cc",

        "gatt/connection_manager.cc",

system/stack/smp/smp_act.cc

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#define LOG_TAG "smp_act"



#include <string.h>

#include "btif/include/btif_api.h"

#include "btif/include/btif_common.h"

#include "btif/include/btif_storage.h"

#include "btif_api.h"

#include "btif_common.h"

#include "btif_storage.h"

#include "device/include/interop.h"

#include "internal_include/bt_target.h"

#include "main/shim/shim.h"