Merge "Enable CloseFrozenAppSockets feature on V+" into main am: 8960842e6a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2960502 Change-Id: I4bd0f7f17d2ee1971f71a9cd287342824ee5bbc1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e304d3a1eb
1 changed files with 2 additions and 2 deletions
|
|
@ -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(
|
||||
|
|
|
|||
Loading…
Reference in a new issue