diff --git a/connections/implementation/flags/nearby_connections_feature_flags.h b/connections/implementation/flags/nearby_connections_feature_flags.h index 070062e1..7d17ab2b 100644 --- a/connections/implementation/flags/nearby_connections_feature_flags.h +++ b/connections/implementation/flags/nearby_connections_feature_flags.h @@ -31,9 +31,6 @@ namespace nearby_connections_feature { // The timeout in millis to report peripheral device lost. constexpr auto kBlePeripheralLostTimeoutMillis = flags::Flag(kConfigPackage, "45411439", 12000); -// Disable instant on lost on BLE without extended feature. -constexpr auto kDisableInstantOnLostOnBleWithoutExtended = - flags::Flag(kConfigPackage, "45687098", true); // When true, enable advertising for instant on lost feature. constexpr auto kEnableAdvertisingForInstantOnLost = flags::Flag(kConfigPackage, "45708614", true); @@ -55,13 +52,6 @@ constexpr auto kEnableDynamicRoleSwitch = // Enable/Disable GATT client disconnection. constexpr auto kEnableGattClientDisconnection = flags::Flag(kConfigPackage, "45698964", false); -// When true, enable instant on lost feature. -// When true, enable multiplexing in NC. -constexpr auto kEnableMultiplex = - flags::Flag(kConfigPackage, "45647946", false); -// Enable/disable multiplex in NC for AWDL. -constexpr auto kEnableMultiplexAwdl = - flags::Flag(kConfigPackage, "45690761", false); // When true, enable multiplexing in NC for Bluetooth. constexpr auto kEnableMultiplexBluetooth = flags::Flag(kConfigPackage, "45676646", false); @@ -80,9 +70,10 @@ constexpr auto kEnablePayloadReceivedAck = // Enable/Disable safe-to-disconnect feature. constexpr auto kEnableSafeToDisconnect = flags::Flag(kConfigPackage, "45425789", false); -// When true, enable scanning for instant on lost feature. -constexpr auto kEnableScanningForInstantOnLost = - flags::Flag(kConfigPackage, "45708613", true); +// Enable/Disable usage of shared CBPeripheralManager for GATT and L2CAP +// servers. +constexpr auto kEnableSharedPeripheralManager = + flags::Flag(kConfigPackage, "45770787", false); // Stop BLE_V2 scanning when upgrading to WIFI Hotspot or WFD. constexpr auto kEnableStopBleScanningOnWifiUpgrade = flags::Flag(kConfigPackage, "45687902", false); @@ -101,10 +92,6 @@ constexpr auto kMediumMaxAllowedReadBytes = // Disable/Enable refactor of BLE/L2CAP in Nearby Connections SDK. constexpr auto kRefactorBleL2cap = flags::Flag(kConfigPackage, "45737079", false); -// Enable/Disable usage of shared CBPeripheralManager for GATT and L2CAP -// servers. -constexpr auto kEnableSharedPeripheralManager = - flags::Flag(kConfigPackage, "45770787", false); // Set the safe-to-disconnect version. // 0. Disabled all. 1. safe-to-disconnect 2. reserved 3. // auto-reconnect(deprecated) diff --git a/connections/implementation/mediums/bluetooth_classic.h b/connections/implementation/mediums/bluetooth_classic.h index a521d9bb..984112da 100644 --- a/connections/implementation/mediums/bluetooth_classic.h +++ b/connections/implementation/mediums/bluetooth_classic.h @@ -22,10 +22,8 @@ #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" #include "absl/functional/any_invocable.h" -#include "connections/implementation/flags/nearby_connections_feature_flags.h" #include "connections/implementation/mediums/bluetooth_radio.h" #include "connections/implementation/mediums/multiplex/multiplex_socket.h" -#include "internal/flags/nearby_flags.h" #include "internal/platform/bluetooth_adapter.h" #include "internal/platform/bluetooth_classic.h" #include "internal/platform/cancellation_flag.h" @@ -236,13 +234,7 @@ class BluetoothClassic { discovery_callbacks_ ABSL_GUARDED_BY(discovery_callbacks_mutex_); // Whether the multiplex feature is enabled. - bool is_multiplex_enabled_ = - NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplex) && - NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexBluetooth); + bool is_multiplex_enabled_ = false; // A map of Bluetooth MacAddress -> MultiplexSocket. absl::flat_hash_map diff --git a/connections/implementation/mediums/wifi_lan.h b/connections/implementation/mediums/wifi_lan.h index 4dffc2c1..0307806f 100644 --- a/connections/implementation/mediums/wifi_lan.h +++ b/connections/implementation/mediums/wifi_lan.h @@ -18,15 +18,12 @@ #include #include #include -#include #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/functional/any_invocable.h" -#include "connections/implementation/flags/nearby_connections_feature_flags.h" #include "connections/implementation/mediums/multiplex/multiplex_socket.h" -#include "internal/flags/nearby_flags.h" #include "internal/platform/cancellation_flag.h" #include "internal/platform/exception.h" #include "internal/platform/expected.h" @@ -219,13 +216,7 @@ class WifiLan { ABSL_GUARDED_BY(mutex_); // Whether the multiplex feature is enabled. - bool is_multiplex_enabled_ = - NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplex) && - NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexWifiLan); + bool is_multiplex_enabled_ = false; // A map of IpAddress -> MultiplexSocket. absl::flat_hash_map