From bd187dc7413b18320fb5c0fa62cc31e8a64c1d95 Mon Sep 17 00:00:00 2001 From: Guogang Li Date: Thu, 10 Apr 2025 15:53:58 -0700 Subject: [PATCH] Update flag for AWDL PiperOrigin-RevId: 746205866 --- .../implementation/flags/nearby_connections_feature_flags.h | 4 ++-- connections/implementation/p2p_cluster_pcp_handler_test.cc | 4 ++++ sharing/nearby_connections_service_impl.cc | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/connections/implementation/flags/nearby_connections_feature_flags.h b/connections/implementation/flags/nearby_connections_feature_flags.h index 29bf758e..d68becf4 100644 --- a/connections/implementation/flags/nearby_connections_feature_flags.h +++ b/connections/implementation/flags/nearby_connections_feature_flags.h @@ -91,11 +91,11 @@ constexpr auto kDisableInstantOnLostOnBleWithoutExtended = flags::Flag(kConfigPackage, "45687098", true); // When true, enable multiplexing in NC for AWDL. constexpr auto kEnableMultiplexAwdl = - flags::Flag(kConfigPackage, "45696647", true); + flags::Flag(kConfigPackage, "45690761", false); // Enable/Disable AWDL in Nearby connections SDK. constexpr auto kEnableAwdl = - flags::Flag(kConfigPackage, "45669531", true); + flags::Flag(kConfigPackage, "45690762", false); } // namespace nearby_connections_feature } // namespace config_package_nearby } // namespace connections diff --git a/connections/implementation/p2p_cluster_pcp_handler_test.cc b/connections/implementation/p2p_cluster_pcp_handler_test.cc index 4c404b76..8e9d2d77 100644 --- a/connections/implementation/p2p_cluster_pcp_handler_test.cc +++ b/connections/implementation/p2p_cluster_pcp_handler_test.cc @@ -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:: diff --git a/sharing/nearby_connections_service_impl.cc b/sharing/nearby_connections_service_impl.cc index 761a3b81..2a29af67 100644 --- a/sharing/nearby_connections_service_impl.cc +++ b/sharing/nearby_connections_service_impl.cc @@ -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;