mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-14 14:46:12 -04:00
Update flag for AWDL
PiperOrigin-RevId: 746205866
This commit is contained in:
committed by
Copybara-Service
parent
17bda8cc94
commit
bd187dc741
@@ -91,11 +91,11 @@ constexpr auto kDisableInstantOnLostOnBleWithoutExtended =
|
||||
flags::Flag<bool>(kConfigPackage, "45687098", true);
|
||||
// When true, enable multiplexing in NC for AWDL.
|
||||
constexpr auto kEnableMultiplexAwdl =
|
||||
flags::Flag<bool>(kConfigPackage, "45696647", true);
|
||||
flags::Flag<bool>(kConfigPackage, "45690761", false);
|
||||
|
||||
// Enable/Disable AWDL in Nearby connections SDK.
|
||||
constexpr auto kEnableAwdl =
|
||||
flags::Flag<bool>(kConfigPackage, "45669531", true);
|
||||
flags::Flag<bool>(kConfigPackage, "45690762", false);
|
||||
} // namespace nearby_connections_feature
|
||||
} // namespace config_package_nearby
|
||||
} // namespace connections
|
||||
|
||||
@@ -81,6 +81,8 @@ class P2pClusterPcpHandlerTest : public testing::Test {
|
||||
protected:
|
||||
void SetUp() override {
|
||||
NEARBY_LOGS(INFO) << "SetUp: begin";
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(
|
||||
config_package_nearby::nearby_connections_feature::kEnableAwdl, true);
|
||||
SetBleExtendedAdvertisementsAvailable(true);
|
||||
SetDisableBluetoothClassicScanning(true);
|
||||
SetBleV2Enabled(true);
|
||||
@@ -245,6 +247,8 @@ class P2pClusterPcpHandlerTestWithParam
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(
|
||||
config_package_nearby::nearby_connections_feature::kEnableBleV2,
|
||||
ble_v2_enabled);
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(
|
||||
config_package_nearby::nearby_connections_feature::kEnableAwdl, true);
|
||||
bool is_disable_bluetooth_scanning = std::get<2>(GetParam());
|
||||
NearbyFlags::GetInstance().OverrideBoolFlagValue(
|
||||
config_package_nearby::nearby_connections_feature::
|
||||
|
||||
@@ -142,6 +142,9 @@ void NearbyConnectionsServiceImpl::StartDiscovery(
|
||||
|
||||
NcDiscoveryOptions options{};
|
||||
options.strategy = ConvertToServiceStrategy(discovery_options.strategy);
|
||||
// NcDiscoveryOptions enabled all mediums by default, we should apply the
|
||||
// settings from discovery_options.
|
||||
options.allowed.SetAll(false);
|
||||
options.allowed.ble = discovery_options.allowed_mediums.ble;
|
||||
options.allowed.bluetooth = discovery_options.allowed_mediums.bluetooth;
|
||||
options.allowed.web_rtc = discovery_options.allowed_mediums.web_rtc;
|
||||
|
||||
Reference in New Issue
Block a user