Skip to content
Snippets Groups Projects
Commit 8960842e authored by Motomu Utsumi's avatar Motomu Utsumi Committed by Gerrit Code Review
Browse files

Merge "Enable CloseFrozenAppSockets feature on V+" into main

parents 13a0cc04 701efffe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
service/src/com/android/server/ConnectivityService.java
+ 2
− 2
View file @ 8960842e
......@@ -1956,8 +1956,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(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment