LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relax IPsec resource count restrictions.

Browse Source 
IPsec resource counts were selected to be conservative, due to unknowns
about device capabilities. Since then, it appears that we no longer need
such stringent quotas, and this can be relaxed.

Bug: 152368091
Test: FrameworksNetTest passing
Change-Id: Id53d14e5698e5fcc410868424176b00350c7ae79
Merged-In: Id53d14e5698e5fcc410868424176b00350c7ae79
(cherry picked from commit 224699fc0b485dd75e6157a88f66a53d64e5a6fd)
This commit is contained in:
Automerger Merge Worker
2020-03-25 00:49:05 +00:00
committed by Benedict Wong
parent 8723291cee
commit fd266f85b6
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/IpSecService.java
View File

@@ -359,10 +359,14 @@ public class IpSecService extends IIpSecService.Stub {
@VisibleForTesting @VisibleForTesting
static final class UserRecord { static final class UserRecord {
/* Maximum number of each type of resource that a single UID may possess */ /* Maximum number of each type of resource that a single UID may possess */
public static final int MAX_NUM_TUNNEL_INTERFACES = 2;
public static final int MAX_NUM_ENCAP_SOCKETS = 2; // Up to 4 active VPNs/IWLAN with potential soft handover.
public static final int MAX_NUM_TRANSFORMS = 4; public static final int MAX_NUM_TUNNEL_INTERFACES = 8;
public static final int MAX_NUM_SPIS = 8; public static final int MAX_NUM_ENCAP_SOCKETS = 16;
// SPIs and Transforms are both cheap, and are 1:1 correlated.
public static final int MAX_NUM_TRANSFORMS = 64;
public static final int MAX_NUM_SPIS = 64;
/** /**
* Store each of the OwnedResource types in an (thinly wrapped) sparse array for indexing * Store each of the OwnedResource types in an (thinly wrapped) sparse array for indexing