diff --git a/connections/implementation/flags/nearby_connections_feature_flags.h b/connections/implementation/flags/nearby_connections_feature_flags.h old mode 100644 new mode 100755 index 9ac89ceb..9b322ee5 --- a/connections/implementation/flags/nearby_connections_feature_flags.h +++ b/connections/implementation/flags/nearby_connections_feature_flags.h @@ -74,6 +74,9 @@ constexpr auto kEnableSafeToDisconnect = // servers. constexpr auto kEnableSharedPeripheralManager = flags::Flag(kConfigPackage, "45770787", false); +// Enable/Disable single copy read/write for input/output buffers. +constexpr auto kEnableSingleCopy = + flags::Flag(kConfigPackage, "45782646", true); // Stop BLE_V2 scanning when upgrading to WIFI Hotspot or WFD. constexpr auto kEnableStopBleScanningOnWifiUpgrade = flags::Flag(kConfigPackage, "45687902", false); @@ -83,6 +86,9 @@ constexpr auto kEnableWifiDirect = // by default, enable Wi-Fi Hotspot client. constexpr auto kEnableWifiHotspotClient = flags::Flag(kConfigPackage, "45648734", true); +// When true, fix the BleServerSocket deadlock/use-after-free (b/494335036). +constexpr auto kFixBleServerSocketDeadlock = + flags::Flag(kConfigPackage, "45782647", true); // Default max transmit packet size for medium. constexpr auto kMediumDefaultMaxTransmitPacketSize = flags::Flag(kConfigPackage, "45669529", 65536); @@ -98,12 +104,6 @@ constexpr auto kRefactorBleL2cap = // 4. auto-resume 5. non-distance-constraint-recovery 6. payload_ack constexpr auto kSafeToDisconnectVersion = flags::Flag(kConfigPackage, "45425841", 0); -// Enable/Disable single copy read/write for input/output buffers. -constexpr auto kEnableSingleCopy = - flags::Flag(kConfigPackage, "45782646", true); -// When true, fix the BleServerSocket deadlock/use-after-free (b/494335036). -constexpr auto kFixBleServerSocketDeadlock = - flags::Flag(kConfigPackage, "45782647", true); } // namespace nearby_connections_feature } // namespace config_package_nearby diff --git a/internal/platform/flags/nearby_platform_feature_flags.h b/internal/platform/flags/nearby_platform_feature_flags.h index 35c2ebcf..0deadf4b 100644 --- a/internal/platform/flags/nearby_platform_feature_flags.h +++ b/internal/platform/flags/nearby_platform_feature_flags.h @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Mendel flags, auto-generated. DO NOT EDIT. #ifndef THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_FLAGS_NEARBY_PLATFORM_FEATURE_FLAGS_H_ #define THIRD_PARTY_NEARBY_INTERNAL_PLATFORM_FLAGS_NEARBY_PLATFORM_FEATURE_FLAGS_H_ @@ -28,46 +29,45 @@ constexpr absl::string_view kConfigPackage = "nearby"; // The Nearby Platform features. namespace nearby_platform_feature { - -// The maximum scanning times for available hotspots. -constexpr auto kWifiHotspotScanMaxRetries = - flags::Flag(kConfigPackage, "45415883", 3); - -// The maximum IP check times during Wi-Fi hotspot connection. -constexpr auto kWifiHotspotCheckIpMaxRetries = - flags::Flag(kConfigPackage, "45415884", 20); - -// The interval between 2 IP check attempts. -constexpr auto kWifiHotspotCheckIpIntervalMillis = - flags::Flag(kConfigPackage, "45415885", 500); - -// The maximum connection times to remote Wi-Fi hotspot. -constexpr auto kWifiHotspotConnectionMaxRetries = - flags::Flag(kConfigPackage, "45415886", 3); - -// The interval between 2 connectin attempts. -constexpr auto kWifiHotspotConnectionIntervalMillis = - flags::Flag(kConfigPackage, "45415887", 2000); - -// The connection timeout to remote Wi-Fi hotspot. -constexpr auto kWifiHotspotConnectionTimeoutMillis = - flags::Flag(kConfigPackage, "45415888", 10000); - +// Disable/Enable GATT feature in BLE v2. +constexpr auto kEnableBleV2Gatt = + flags::Flag(kConfigPackage, "45415180", true); +// Disable/Enable GATT feature on devices without BLE extended feature. +constexpr auto kEnableBleV2GattOnNonExtendedDevice = + flags::Flag(kConfigPackage, "45415267", true); // Enable/Disable Intel PIe SDK to query/set WIFI feature. constexpr auto kEnableIntelPieSdk = flags::Flag(kConfigPackage, "45428547", false); - -// Enable/Disable new Bluetooth refactor -constexpr auto kEnableNewBluetoothRefactor = - flags::Flag(kConfigPackage, "45615156", false); - -// The send buffer size of blocking socket +// Replace std::async with platform thread +constexpr auto kEnablePlatformThreadToNetwork = + flags::Flag(kConfigPackage, "45412711", true); +// Enable/Disable task scheduler for ScheduledExecutor and timer. +constexpr auto kEnableTaskScheduler = + flags::Flag(kConfigPackage, "45643835", true); +// Enable/Disable Wi-Fi hotspot native. +constexpr auto kEnableWifiHotspotNative = + flags::Flag(kConfigPackage, "45667396", true); +// The send buffer size of blocking socket. constexpr auto kSocketSendBufferSize = flags::Flag(kConfigPackage, "45673785", 524288); - -// Run scheduled executor callback on executor thread. -constexpr auto kRunScheduledExecutorCallbackOnExecutorThread = - flags::Flag(kConfigPackage, "45686494", false); +// The interval between 2 IP check attempts. +constexpr auto kWifiHotspotCheckIpIntervalMillis = + flags::Flag(kConfigPackage, "45415885", 500); +// The maximum IP check times during Wi-Fi hotspot connection. +constexpr auto kWifiHotspotCheckIpMaxRetries = + flags::Flag(kConfigPackage, "45415884", 10); +// The interval between 2 connectin attempts. +constexpr auto kWifiHotspotConnectionIntervalMillis = + flags::Flag(kConfigPackage, "45415887", 2000); +// The maximum connection times to remote WiFi hotspot. +constexpr auto kWifiHotspotConnectionMaxRetries = + flags::Flag(kConfigPackage, "45415886", 3); +// The connection timeout to remote Wi-Fi hotspot. +constexpr auto kWifiHotspotConnectionTimeoutMillis = + flags::Flag(kConfigPackage, "45415888", 10000); +// The max retry times to scan WiFi hotspots. +constexpr auto kWifiHotspotScanMaxRetries = + flags::Flag(kConfigPackage, "45415883", 3); } // namespace nearby_platform_feature } // namespace config_package_nearby diff --git a/sharing/flags/generated/README.md b/sharing/flags/generated/README.md deleted file mode 100644 index a7682807..00000000 --- a/sharing/flags/generated/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Feature flags generation - -This directory contains the generated Nearby Share feature flags definition -file. - -## Adding flags - -New flags need to be added to google3/googledata/experiments/mobile/nearby/features/nearby_sharing_feature.gcl. - -To generate code for the new flags, run: - -``` -blaze build //third_party/nearby/sharing/flags:nearby_sharing_feature_flags_cpp_consts -``` - -The creates the generated file in *blaze-genfiles/third_party/nearby/sharing/flags/nearby_sharing_feature_flags.h*. Copy this file to google3/third_party/nearby/sharing/flags/generated/nearby_sharing_feature_flags.h -and include in your CL for submission. diff --git a/sharing/flags/generated/nearby_sharing_feature_flags.h b/sharing/flags/generated/nearby_sharing_feature_flags.h index ec0900d3..25beaeb5 100755 --- a/sharing/flags/generated/nearby_sharing_feature_flags.h +++ b/sharing/flags/generated/nearby_sharing_feature_flags.h @@ -47,9 +47,6 @@ constexpr auto kEnableMediumWifiLan = // Enable/disable retry/resume transfer for partial files. constexpr auto kEnableRetryResumeTransfer = flags::Flag(kConfigPackage, "45411589", false); -// Enable/disable self share UI in Nearby Share -constexpr auto kEnableSelfShareUi = - flags::Flag(kConfigPackage, "45418908", false); // Enable/disable sending desktop events constexpr auto kEnableSendingDesktopEvents = flags::Flag(kConfigPackage, "45459748", false); @@ -112,7 +109,6 @@ inline absl::btree_map&> GetBoolFlags() { {45418905, kEnableMediumWebRtc}, {45418906, kEnableMediumWifiLan}, {45411589, kEnableRetryResumeTransfer}, - {45418908, kEnableSelfShareUi}, {45459748, kEnableSendingDesktopEvents}, {45409033, kShowAutoUpdateSetting}, {45762616, kEnableFileSync},