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

Commit 09809f57 authored by Łukasz Rymanowski's avatar Łukasz Rymanowski Committed by Automerger Merge Worker
Browse files

eatt: Handle L2CAP collision on EATT am: e3929d79 am: 56f9e03f am: 539f5e32 am: 2ed75182 

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



Change-Id: I5f745b7ee31c714391b3ee423dff454620780486
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5cfbd788 2ed75182

system/conf/bt_stack.conf

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,9 @@ TRC_HID_DEV=2 
# Start EATT on unecrypted link

#PTS_ConnectEattUnencrypted=true



# Force EATT implementation to connect EATT as a peripheral for collision test case

#PTS_EattPeripheralCollionSupport=true



# Disable BR/EDR discovery after LE pairing to avoid cross key derivation errors

#PTS_DisableSDPOnLEPair=true

system/internal_include/stack_config.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ typedef struct { 
  bool (*get_pts_connect_eatt_unconditionally)(void);

  bool (*get_pts_connect_eatt_before_encryption)(void);

  bool (*get_pts_unencrypt_broadcast)(void);

  bool (*get_pts_eatt_peripheral_collision_support)(void);

  config_t* (*get_all)(void);

} stack_config_t;

system/main/stack_config.cc

+8 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ const char* PTS_CONNECT_EATT_UNCONDITIONALLY = 
    "PTS_ConnectEattUncondictionally";

const char* PTS_CONNECT_EATT_UNENCRYPTED = "PTS_ConnectEattUnencrypted";

const char* PTS_BROADCAST_UNENCRYPTED = "PTS_BroadcastUnencrypted";

const char* PTS_EATT_PERIPHERAL_COLLISION_SUPPORT =

    "PTS_EattPeripheralCollionSupport";



static std::unique_ptr<config_t> config;

}  // namespace
@@ -135,6 +137,11 @@ static bool get_pts_unencrypt_broadcast(void) { 
                         PTS_BROADCAST_UNENCRYPTED, false);

}



static bool get_pts_eatt_peripheral_collision_support(void) {

  return config_get_bool(*config, CONFIG_DEFAULT_SECTION,

                         PTS_EATT_PERIPHERAL_COLLISION_SUPPORT, false);

}



static config_t* get_all(void) { return config.get(); }



const stack_config_t interface = {get_trace_config_enabled,
@@ -148,6 +155,7 @@ const stack_config_t interface = {get_trace_config_enabled, 
                                  get_pts_connect_eatt_unconditionally,

                                  get_pts_connect_eatt_before_encryption,

                                  get_pts_unencrypt_broadcast,

                                  get_pts_eatt_peripheral_collision_support,

                                  get_all};



const stack_config_t* stack_config_get_interface(void) { return &interface; }

system/profile/avrcp/tests/avrcp_device_fuzz/avrcp_device_fuzz.cc

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ const stack_config_t interface = {nullptr, get_pts_avrcp_test, 
                                  nullptr, nullptr,

                                  nullptr, nullptr,

                                  nullptr, nullptr,

                                  nullptr, nullptr};

                                  nullptr, nullptr,

                                  nullptr};



void Callback(uint8_t, bool, std::unique_ptr<::bluetooth::PacketBuilder>) {}

system/profile/avrcp/tests/avrcp_device_test.cc

+2 −1
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ const stack_config_t interface = {nullptr, get_pts_avrcp_test, 
                                  nullptr, nullptr,

                                  nullptr, nullptr,

                                  nullptr, nullptr,

                                  nullptr, nullptr};

                                  nullptr, nullptr,

                                  nullptr};



// TODO (apanicke): All the tests below are just basic positive unit tests.

// Add more tests to increase code coverage.