From e9f2c761ab1ec9cf0f5ab30e71ffaa315d309a28 Mon Sep 17 00:00:00 2001
From: Anay Wadhera <awadhera@google.com>
Date: Tue, 15 Oct 2024 10:42:10 -0700
Subject: [PATCH] Internal updates

PiperOrigin-RevId: 686159198
---
 .../generated/nearby_sharing_feature_flags.h   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sharing/flags/generated/nearby_sharing_feature_flags.h b/sharing/flags/generated/nearby_sharing_feature_flags.h
index f65f3922..63f4785d 100755
--- a/sharing/flags/generated/nearby_sharing_feature_flags.h
+++ b/sharing/flags/generated/nearby_sharing_feature_flags.h
@@ -32,9 +32,6 @@ namespace nearby_sharing_feature {
 // Time to delay the endpoint loss in milliseconds.
 constexpr auto kDelayEndpointLossMs =
     flags::Flag<int64_t>(kConfigPackage, "45632386", 500);
-// When true, delete the file payload which received unexpectedly.
-constexpr auto kDeleteUnexpectedReceivedFileFix =
-    flags::Flag<bool>(kConfigPackage, "45657036", false);
 // Enable/disable the use of BLE as a connection medium.
 constexpr auto kEnableBleForTransfer =
     flags::Flag<bool>(kConfigPackage, "45427466", false);
@@ -79,6 +76,12 @@ constexpr auto kUseGrpcClient =
 // When true, dedup discovered endpoints.
 constexpr auto kApplyEndpointsDedup =
     flags::Flag<bool>(kConfigPackage, "45656298", false);
+// When true, delete the file payload which received unexpectedly.
+constexpr auto kDeleteUnexpectedReceivedFileFix =
+    flags::Flag<bool>(kConfigPackage, "45657036", false);
+// The time in milliseconds a cached entry can be in LOST state.
+constexpr auto kDiscoveryCacheLostExpiryMs =
+    flags::Flag<int64_t>(kConfigPackage, "45658774", 500);
 // Enable/disable QR Code UI
 constexpr auto kEnableQrCodeUi =
     flags::Flag<bool>(kConfigPackage, "45417647", false);
@@ -88,13 +91,12 @@ constexpr auto kShowAdminModeWarning =
 // Update track
 constexpr auto kUpdateTrack =
     flags::Flag<absl::string_view>(kConfigPackage, "45409861", "");
-// The time in milliseconds a cached entry can be in LOST state.
-constexpr auto kDiscoveryCacheLostExpiryMs =
-    flags::Flag<int64_t>(kConfigPackage, "45658774", 500);
+// Enable the info banner to display duplicate Quick Share apps.
+constexpr auto kEnableConflictBanner =
+    flags::Flag<bool>(kConfigPackage, "45661130", false);
 
 inline absl::btree_map<int, const flags::Flag<bool>&> GetBoolFlags() {
   return {
-      {45657036, kDeleteUnexpectedReceivedFileFix},
       {45427466, kEnableBleForTransfer},
       {45409184, kEnableCertificatesDump},
       {45418905, kEnableMediumWebRtc},
@@ -108,8 +110,10 @@ inline absl::btree_map<int, const flags::Flag<bool>&> GetBoolFlags() {
       {45409033, kShowAutoUpdateSetting},
       {45630055, kUseGrpcClient},
       {45656298, kApplyEndpointsDedup},
+      {45657036, kDeleteUnexpectedReceivedFileFix},
       {45417647, kEnableQrCodeUi},
       {45410558, kShowAdminModeWarning},
+      {45661130, kEnableConflictBanner},
   };
 }