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

Commit 43a2b39b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I41f027a7,I98d7721f,I855a9bab,I8a3c47dd am: 09dda605 am: d654fc6e am: eac09bdf 

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



Change-Id: I8a1e94b55f3c53281c2ae59b27e89adfe5a7cd2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 471f819c eac09bdf

system/conf/bt_stack.conf

+9 −0
Original line number Diff line number Diff line
@@ -44,6 +44,15 @@ TRC_HID_DEV=2 
# Disable LE Connection updates

#PTS_DisableConnUpdates=true



# Use EATT for the notifications

#PTS_ForceEattForNotifications=true



# Start EATT without validation Server Supported Features

#PTS_ConnectEattUncondictionally=true



# Start EATT on unecrypted link

#PTS_ConnectEattUnencrypted=true



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

#PTS_DisableSDPOnLEPair=true

system/internal_include/bt_target.h

+4 −0
Original line number Diff line number Diff line
@@ -551,6 +551,10 @@ 
#define GATT_CONFORMANCE_TESTING FALSE

#endif



/* Used only for GATT Multiple Variable Length Notifications PTS tests */

#ifndef GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_NOTIF

#define GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_NOTIF FALSE

#endif

/******************************************************************************

 *

 * SMP

system/internal_include/stack_config.h

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ typedef struct { 
  bool (*get_pts_crosskey_sdp_disable)(void);

  const std::string* (*get_pts_smp_options)(void);

  int (*get_pts_smp_failure_case)(void);

  bool (*get_pts_force_eatt_for_notifications)(void);

  bool (*get_pts_connect_eatt_unconditionally)(void);

  bool (*get_pts_connect_eatt_before_encryption)(void);

  config_t* (*get_all)(void);

} stack_config_t;

system/main/stack_config.cc

+30 −5
Original line number Diff line number Diff line
@@ -33,6 +33,10 @@ const char* PTS_LE_CONN_UPDATED_DISABLED = "PTS_DisableConnUpdates"; 
const char* PTS_DISABLE_SDP_LE_PAIR = "PTS_DisableSDPOnLEPair";

const char* PTS_SMP_PAIRING_OPTIONS_KEY = "PTS_SmpOptions";

const char* PTS_SMP_FAILURE_CASE_KEY = "PTS_SmpFailureCase";

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";



static std::unique_ptr<config_t> config;

}  // namespace
@@ -110,12 +114,33 @@ static int get_pts_smp_failure_case(void) { 
                        PTS_SMP_FAILURE_CASE_KEY, 0);

}



static bool get_pts_force_eatt_for_notifications(void) {

  return config_get_bool(*config, CONFIG_DEFAULT_SECTION,

                         PTS_FORCE_EATT_FOR_NOTIFICATIONS, false);

}



static bool get_pts_connect_eatt_unconditionally(void) {

  return config_get_bool(*config, CONFIG_DEFAULT_SECTION,

                         PTS_CONNECT_EATT_UNCONDITIONALLY, false);

}



static bool get_pts_connect_eatt_before_encryption(void) {

  return config_get_bool(*config, CONFIG_DEFAULT_SECTION,

                         PTS_CONNECT_EATT_UNENCRYPTED, false);

}



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



const stack_config_t interface = {

    get_trace_config_enabled,     get_pts_avrcp_test,

    get_pts_secure_only_mode,     get_pts_conn_updates_disabled,

    get_pts_crosskey_sdp_disable, get_pts_smp_options,

    get_pts_smp_failure_case,     get_all};

const stack_config_t interface = {get_trace_config_enabled,

                                  get_pts_avrcp_test,

                                  get_pts_secure_only_mode,

                                  get_pts_conn_updates_disabled,

                                  get_pts_crosskey_sdp_disable,

                                  get_pts_smp_options,

                                  get_pts_smp_failure_case,

                                  get_pts_force_eatt_for_notifications,

                                  get_pts_connect_eatt_unconditionally,

                                  get_pts_connect_eatt_before_encryption,

                                  get_all};



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

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

+6 −3
Original line number Diff line number Diff line
@@ -54,8 +54,11 @@ class FakeA2dpInterface : public A2dpInterface { 


bool get_pts_avrcp_test(void) { return false; }



const stack_config_t interface = {

    nullptr, get_pts_avrcp_test, nullptr, nullptr, nullptr, nullptr, nullptr,

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>) {}