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

Commit 2968fdd3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use pts flag to create broadcast without encryption" am: ce0be425 am:... 

Merge "Use pts flag to create broadcast without encryption" am: ce0be425 am: 571da8bd am: 2c7676d0 am: 60bd35f5

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



Change-Id: Ib3b789a2d33bc77f78e2681faa13808982cd5e77
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dd34c7c5 60bd35f5

system/conf/bt_stack.conf

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ TRC_HID_DEV=2 
# PTS AVRCP Test mode

#PTS_AvrcpTest=true



# Start broadcast with unecryption mode

#PTS_BroadcastUnencrypted=true



# SMP Certification Failure Cases

# Set any of the following SMP error values (from smp_api_types.h)

# to induce pairing failues for various PTS SMP test cases.

system/internal_include/stack_config.h

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

  bool (*get_pts_connect_eatt_unconditionally)(void);

  bool (*get_pts_connect_eatt_before_encryption)(void);

  bool (*get_pts_unencrypt_broadcast)(void);

  config_t* (*get_all)(void);

} stack_config_t;

system/main/stack_config.cc

+7 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ const char* PTS_FORCE_EATT_FOR_NOTIFICATIONS = "PTS_ForceEattForNotifications"; 
const char* PTS_CONNECT_EATT_UNCONDITIONALLY =

    "PTS_ConnectEattUncondictionally";

const char* PTS_CONNECT_EATT_UNENCRYPTED = "PTS_ConnectEattUnencrypted";

const char* PTS_BROADCAST_UNENCRYPTED = "PTS_BroadcastUnencrypted";



static std::unique_ptr<config_t> config;

}  // namespace
@@ -129,6 +130,11 @@ static bool get_pts_connect_eatt_before_encryption(void) { 
                         PTS_CONNECT_EATT_UNENCRYPTED, false);

}



static bool get_pts_unencrypt_broadcast(void) {

  return config_get_bool(*config, CONFIG_DEFAULT_SECTION,

                         PTS_BROADCAST_UNENCRYPTED, false);

}



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



const stack_config_t interface = {get_trace_config_enabled,
@@ -141,6 +147,7 @@ const stack_config_t interface = {get_trace_config_enabled, 
                                  get_pts_force_eatt_for_notifications,

                                  get_pts_connect_eatt_unconditionally,

                                  get_pts_connect_eatt_before_encryption,

                                  get_pts_unencrypt_broadcast,

                                  get_all};



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

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

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ const stack_config_t interface = {nullptr, get_pts_avrcp_test, 
                                  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

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ const stack_config_t interface = {nullptr, get_pts_avrcp_test, 
                                  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.