From a7dd5feebb7ca908a07c9f47a86f48a9db7b86dc Mon Sep 17 00:00:00 2001 From: hai007 Date: Mon, 20 Apr 2026 17:35:16 -0700 Subject: [PATCH] Automated Code Change PiperOrigin-RevId: 902903748 --- connections/implementation/client_proxy.cc | 18 ------ .../implementation/client_proxy_test.cc | 60 ++----------------- .../mediums/bluetooth_classic.cc | 8 +-- .../mediums/bluetooth_classic.h | 3 +- connections/implementation/mediums/wifi_lan.h | 6 +- .../implementation/mediums/wifi_lan_test.cc | 8 --- internal/platform/blocking_queue_stream.h | 4 +- .../platform/blocking_queue_stream_test.cc | 42 +++---------- 8 files changed, 16 insertions(+), 133 deletions(-) diff --git a/connections/implementation/client_proxy.cc b/connections/implementation/client_proxy.cc index a1a5ce88..f35d9f6d 100644 --- a/connections/implementation/client_proxy.cc +++ b/connections/implementation/client_proxy.cc @@ -1207,24 +1207,6 @@ OsInfo::OsType ClientProxy::OSNameToOsInfoType(api::OSName osName) { } std::int32_t ClientProxy::GetLocalMultiplexSocketBitmask() const { - if (NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplex)) { - std::int32_t multiplex_bitmask = - (NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexBluetooth) - ? kBtMultiplexEnabled - : 0) | - (NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexWifiLan) - ? kWifiLanMultiplexEnabled - : 0); - LOG(INFO) << "ClientProxy [GetLocalMultiplexSocketBitmask]: " - << multiplex_bitmask; - return multiplex_bitmask; - } return 0; } diff --git a/connections/implementation/client_proxy_test.cc b/connections/implementation/client_proxy_test.cc index 172a58d8..5da9aabd 100644 --- a/connections/implementation/client_proxy_test.cc +++ b/connections/implementation/client_proxy_test.cc @@ -1484,51 +1484,10 @@ TEST_F(ClientProxyTest, TestAutoBwuWhenListeningWithAutoBwu) { } TEST_F(ClientProxyTest, TestMultiplexSocketBitmask) { - if (!NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplex)) { - EXPECT_EQ(client1()->GetLocalMultiplexSocketBitmask(), 0); - } - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature::kEnableMultiplex, - true); EXPECT_EQ(client1()->GetLocalMultiplexSocketBitmask(), 0); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexBluetooth, - true); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexWifiLan, - true); - EXPECT_EQ( - client1()->GetLocalMultiplexSocketBitmask(), - ClientProxy::kBtMultiplexEnabled | ClientProxy::kWifiLanMultiplexEnabled); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature::kEnableMultiplex, - false); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexBluetooth, - false); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexWifiLan, - false); } TEST_F(ClientProxyTest, TestRemoteMultiplexSocketBitmask) { - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature::kEnableMultiplex, - true); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexBluetooth, - true); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexWifiLan, - true); Endpoint advertising_endpoint = StartAdvertising(client1(), advertising_connection_listener_); OnAdvertisingConnectionInitiated(client1(), advertising_endpoint); @@ -1543,23 +1502,12 @@ TEST_F(ClientProxyTest, TestRemoteMultiplexSocketBitmask) { ->GetRemoteMultiplexSocketBitmask(advertising_endpoint.id) .value(), ClientProxy::kBtMultiplexEnabled | ClientProxy::kWifiLanMultiplexEnabled); - EXPECT_TRUE(client1()->IsMultiplexSocketSupported(advertising_endpoint.id, - Medium::BLUETOOTH)); - EXPECT_TRUE(client1()->IsMultiplexSocketSupported(advertising_endpoint.id, - Medium::WIFI_LAN)); + EXPECT_FALSE(client1()->IsMultiplexSocketSupported(advertising_endpoint.id, + Medium::BLUETOOTH)); + EXPECT_FALSE(client1()->IsMultiplexSocketSupported(advertising_endpoint.id, + Medium::WIFI_LAN)); EXPECT_FALSE(client1()->IsMultiplexSocketSupported(advertising_endpoint.id, Medium::WIFI_AWARE)); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature::kEnableMultiplex, - false); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexBluetooth, - false); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexWifiLan, - false); } TEST_F(ClientProxyTest, SaveClientInfoFromPreferences) { diff --git a/connections/implementation/mediums/bluetooth_classic.cc b/connections/implementation/mediums/bluetooth_classic.cc index 2ee55c30..f38dc278 100644 --- a/connections/implementation/mediums/bluetooth_classic.cc +++ b/connections/implementation/mediums/bluetooth_classic.cc @@ -65,13 +65,7 @@ BluetoothClassic::BluetoothClassic( : radio_(radio), adapter_(radio_.GetBluetoothAdapter()), medium_(std::move(medium)) { - is_multiplex_enabled_ = - NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplex) && - NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature:: - kEnableMultiplexBluetooth); + is_multiplex_enabled_ = false; } BluetoothClassic::~BluetoothClassic() { diff --git a/connections/implementation/mediums/bluetooth_classic.h b/connections/implementation/mediums/bluetooth_classic.h index d4221a1c..f16cf65f 100644 --- a/connections/implementation/mediums/bluetooth_classic.h +++ b/connections/implementation/mediums/bluetooth_classic.h @@ -236,8 +236,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); + 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 990439ce..3637b158 100644 --- a/connections/implementation/mediums/wifi_lan.h +++ b/connections/implementation/mediums/wifi_lan.h @@ -219,11 +219,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 diff --git a/connections/implementation/mediums/wifi_lan_test.cc b/connections/implementation/mediums/wifi_lan_test.cc index 95bbfa5c..2f2ac8c9 100644 --- a/connections/implementation/mediums/wifi_lan_test.cc +++ b/connections/implementation/mediums/wifi_lan_test.cc @@ -168,11 +168,6 @@ TEST_P(WifiLanTest, CanConnect) { } TEST_P(WifiLanTest, CanConnectWithMultiplex) { - bool is_multiplex_enabled = NearbyFlags::GetInstance().GetBoolFlag( - config_package_nearby::nearby_connections_feature::kEnableMultiplex); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature::kEnableMultiplex, - true); bool is_multiplex_enabled_wifi_lan = NearbyFlags::GetInstance().GetBoolFlag( config_package_nearby::nearby_connections_feature:: kEnableMultiplexWifiLan); @@ -235,9 +230,6 @@ TEST_P(WifiLanTest, CanConnectWithMultiplex) { EXPECT_TRUE(socket_for_server.IsValid()); EXPECT_TRUE(socket_for_client.IsValid()); env_.Stop(); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - config_package_nearby::nearby_connections_feature::kEnableMultiplex, - is_multiplex_enabled); NearbyFlags::GetInstance().OverrideBoolFlagValue( config_package_nearby::nearby_connections_feature:: kEnableMultiplexWifiLan, diff --git a/internal/platform/blocking_queue_stream.h b/internal/platform/blocking_queue_stream.h index 79030bc9..f898ce04 100644 --- a/internal/platform/blocking_queue_stream.h +++ b/internal/platform/blocking_queue_stream.h @@ -41,9 +41,7 @@ class BlockingQueueStream : public InputStream { private: mutable Mutex mutex_; - bool is_multiplex_enabled_ = NearbyFlags::GetInstance().GetBoolFlag( - connections::config_package_nearby::nearby_connections_feature:: - kEnableMultiplex); + bool is_multiplex_enabled_ = false; ArrayBlockingQueue blocking_queue_{ FeatureFlags::GetInstance() .GetFlags() diff --git a/internal/platform/blocking_queue_stream_test.cc b/internal/platform/blocking_queue_stream_test.cc index bf1d73ef..3064c002 100644 --- a/internal/platform/blocking_queue_stream_test.cc +++ b/internal/platform/blocking_queue_stream_test.cc @@ -24,47 +24,21 @@ namespace nearby { namespace { TEST(BlockingQueueStreamTest, ReadSuccess) { - bool is_multiplex_enabled = NearbyFlags::GetInstance().GetBoolFlag( - connections::config_package_nearby::nearby_connections_feature:: - kEnableMultiplex); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - connections::config_package_nearby::nearby_connections_feature:: - kEnableMultiplex, true); - - BlockingQueueStream stream; - ByteArray bytes = ByteArray("test1test2test3"); - stream.Write(bytes); - ExceptionOr result = stream.Read(5); - EXPECT_EQ(result.result(), ByteArray("test1")); - result = stream.Read(5); - EXPECT_EQ(result.result(), ByteArray("test2")); - result = stream.Read(5); - EXPECT_EQ(result.result(), ByteArray("test3")); - stream.Close(); - - NearbyFlags::GetInstance().OverrideBoolFlagValue( - connections::config_package_nearby::nearby_connections_feature:: - kEnableMultiplex, is_multiplex_enabled); -} - -TEST(BlockingQueueStreamTest, MultiplexDisabled) { - bool is_multiplex_enabled = NearbyFlags::GetInstance().GetBoolFlag( - connections::config_package_nearby::nearby_connections_feature:: - kEnableMultiplex); - NearbyFlags::GetInstance().OverrideBoolFlagValue( - connections::config_package_nearby::nearby_connections_feature:: - kEnableMultiplex, false); - BlockingQueueStream stream; ByteArray bytes = ByteArray("test1test2test3"); stream.Write(bytes); ExceptionOr result = stream.Read(5); EXPECT_EQ(result, ExceptionOr(Exception::kExecution)); stream.Close(); +} - NearbyFlags::GetInstance().OverrideBoolFlagValue( - connections::config_package_nearby::nearby_connections_feature:: - kEnableMultiplex, is_multiplex_enabled); +TEST(BlockingQueueStreamTest, MultiplexDisabled) { + BlockingQueueStream stream; + ByteArray bytes = ByteArray("test1test2test3"); + stream.Write(bytes); + ExceptionOr result = stream.Read(5); + EXPECT_EQ(result, ExceptionOr(Exception::kExecution)); + stream.Close(); } } // namespace