From 701efffe238a1e9eb40679435fb0875b3eff717a Mon Sep 17 00:00:00 2001 From: Motomu Utsumi Date: Tue, 13 Feb 2024 12:46:59 +0900 Subject: [PATCH] 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 1c924889e0..a522b4f4e3 100755 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -1955,8 +1955,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 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(