commit 701efffe238a1e9eb40679435fb0875b3eff717a
author Motomu Utsumi <motomuman@google.com> Tue Feb 13 12:46:59 2024 +0900
committer Motomu Utsumi <motomuman@google.com> Tue Feb 13 12:46:59 2024 +0900
tree cfd5f6e331e1dfbdd375d7e63f0beba039340b9a
parent 901db13423b8d260d12e2f40fa15e0878af4e4f6

Enable CloseFrozenAppSockets feature on V+

On V, this feature is enabled on all devices.
On U, this feature is enabled if the flag is enabled.

Test: TH
Change-Id: I025b9a8098a0896be51cf06c5b8262243ba439b7

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 1c92488..a522b4f 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -1955,8 +1955,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(