From 39959b1cb39e5c646a33f7ee2d84aa7d5bbd4f7e Mon Sep 17 00:00:00 2001
From: Paul Hu <paulhu@google.com>
Date: Thu, 13 Mar 2025 11:33:49 +0000
Subject: [PATCH] Enable the cached service removal feature by default

The nsd_cached_services_removal flag has been successfully rolled
out to the public stage on Pixel devices and has significantly
improved the Nearby connection success rate. Consequently, this
flag should be enabled by default with a kill switch, allowing
the feature to be deployed to all production devices.

Bug: 352629221
Test: atest ConnectivityCoverageTests NsdManagerTest
Change-Id: Ib37b94d729e4d9a8da6f3e574bf149141ebe4a56
---
 service-t/src/com/android/server/NsdService.java                | 2 +-
 .../com/android/server/connectivity/mdns/MdnsFeatureFlags.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-t/src/com/android/server/NsdService.java b/service-t/src/com/android/server/NsdService.java
index 555549c871..4af8b0e981 100644
--- a/service-t/src/com/android/server/NsdService.java
+++ b/service-t/src/com/android/server/NsdService.java
@@ -1942,7 +1942,7 @@ public class NsdService extends INsdManager.Stub {
                         mContext, MdnsFeatureFlags.NSD_QUERY_WITH_KNOWN_ANSWER))
                 .setAvoidAdvertisingEmptyTxtRecords(mDeps.isTetheringFeatureNotChickenedOut(
                         mContext, MdnsFeatureFlags.NSD_AVOID_ADVERTISING_EMPTY_TXT_RECORDS))
-                .setIsCachedServicesRemovalEnabled(mDeps.isFeatureEnabled(
+                .setIsCachedServicesRemovalEnabled(mDeps.isTetheringFeatureNotChickenedOut(
                         mContext, MdnsFeatureFlags.NSD_CACHED_SERVICES_REMOVAL))
                 .setCachedServicesRetentionTime(mDeps.getDeviceConfigPropertyInt(
                         MdnsFeatureFlags.NSD_CACHED_SERVICES_RETENTION_TIME,
diff --git a/service-t/src/com/android/server/connectivity/mdns/MdnsFeatureFlags.java b/service-t/src/com/android/server/connectivity/mdns/MdnsFeatureFlags.java
index 1cf5e4d854..11a374d9c8 100644
--- a/service-t/src/com/android/server/connectivity/mdns/MdnsFeatureFlags.java
+++ b/service-t/src/com/android/server/connectivity/mdns/MdnsFeatureFlags.java
@@ -316,7 +316,7 @@ public class MdnsFeatureFlags {
             mIsAggressiveQueryModeEnabled = false;
             mIsQueryWithKnownAnswerEnabled = false;
             mAvoidAdvertisingEmptyTxtRecords = true; // Default enabled.
-            mIsCachedServicesRemovalEnabled = false;
+            mIsCachedServicesRemovalEnabled = true; // Default enabled.
             mCachedServicesRetentionTime = DEFAULT_CACHED_SERVICES_RETENTION_TIME_MILLISECONDS;
             mIsAccurateDelayCallbackEnabled = false;
             mIsShortHostnamesEnabled = true; // Default enabled.