Merge "VtsBluetooth: Update advertising set requirements" into main

This commit is contained in:
Myles Watson
2024-07-24 22:36:56 +00:00
committed by Gerrit Code Review

View File

@@ -27,7 +27,6 @@
#include <android/binder_process.h> #include <android/binder_process.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
#include <atomic>
#include <chrono> #include <chrono>
#include <condition_variable> #include <condition_variable>
#include <future> #include <future>
@@ -68,8 +67,8 @@ using ::bluetooth::hci::PacketView;
using ::bluetooth::hci::ReadLocalVersionInformationBuilder; using ::bluetooth::hci::ReadLocalVersionInformationBuilder;
using ::bluetooth::hci::ReadLocalVersionInformationCompleteView; using ::bluetooth::hci::ReadLocalVersionInformationCompleteView;
static constexpr uint8_t kMinLeAdvSetForBt5 = 16; static constexpr uint8_t kMinLeAdvSetForBt5 = 10;
static constexpr uint8_t kMinLeAdvSetForBt5FoTv = 10; static constexpr uint8_t kMinLeAdvSetForBt5ForTv = 10;
static constexpr uint8_t kMinLeResolvingListForBt5 = 8; static constexpr uint8_t kMinLeResolvingListForBt5 = 8;
static constexpr size_t kNumHciCommandsBandwidth = 100; static constexpr size_t kNumHciCommandsBandwidth = 100;
@@ -1036,7 +1035,7 @@ TEST_P(BluetoothAidlTest, Vsr_Bluetooth5Requirements) {
auto num_adv_set = num_adv_set_view.GetNumberSupportedAdvertisingSets(); auto num_adv_set = num_adv_set_view.GetNumberSupportedAdvertisingSets();
if (isTv() && get_vsr_api_level() == __ANDROID_API_U__) { if (isTv() && get_vsr_api_level() == __ANDROID_API_U__) {
ASSERT_GE(num_adv_set, kMinLeAdvSetForBt5FoTv); ASSERT_GE(num_adv_set, kMinLeAdvSetForBt5ForTv);
} else { } else {
ASSERT_GE(num_adv_set, kMinLeAdvSetForBt5); ASSERT_GE(num_adv_set, kMinLeAdvSetForBt5);
} }