commit 8960842e6a48d471d730b5de0ad0155df4c9bbab
author Motomu Utsumi <motomuman@google.com> Tue Feb 13 07:37:10 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 13 07:37:10 2024 +0000
tree 8518b2338b19da54b470659f4b0e4b6ecbdcc070
parent 13a0cc04f642e50736b67863a03cc86c4a87fd58
parent 701efffe238a1e9eb40679435fb0875b3eff717a

Merge "Enable CloseFrozenAppSockets feature on V+" into main

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index eff9bbd..e6287bc 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -1956,8 +1956,8 @@
         mMulticastRoutingCoordinatorService =
                 mDeps.makeMulticastRoutingCoordinatorService(mHandler);
 
-        mDestroyFrozenSockets = mDeps.isAtLeastU()
-                && mDeps.isFeatureEnabled(context, KEY_DESTROY_FROZEN_SOCKETS_VERSION);
+        mDestroyFrozenSockets = mDeps.isAtLeastV() || (mDeps.isAtLeastU()
+                && mDeps.isFeatureEnabled(context, KEY_DESTROY_FROZEN_SOCKETS_VERSION));
         mDelayDestroyFrozenSockets = mDeps.isAtLeastU()
                 && mDeps.isFeatureEnabled(context, DELAY_DESTROY_FROZEN_SOCKETS_VERSION);
         mAllowSysUiConnectivityReports = mDeps.isFeatureNotChickenedOut(