joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Enable the cached service removal feature by default" into main am: c5852b2601 am: c832d05817

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3541241

Change-Id: I952da3620a3f517bc5cf30565b97d81ee303b6b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2025-03-16 21:54:19 -07:00 • committed by Automerger Merge Worker
commit 7b2fef9aa2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service-t/src/com/android/server/NsdService.java
View file

@ -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,

2
service-t/src/com/android/server/connectivity/mdns/MdnsFeatureFlags.java
View file

@ -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.