Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3769208 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Benedict Wong
Browse files

Relax IPsec resource count restrictions. 

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 224699fc)
parent e9633837

services/core/java/com/android/server/IpSecService.java

+8 −4
Original line number Diff line number Diff line
@@ -359,10 +359,14 @@ public class IpSecService extends IIpSecService.Stub { 
    @VisibleForTesting

    static final class UserRecord {

        /* 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;

        public static final int MAX_NUM_TRANSFORMS = 4;

        public static final int MAX_NUM_SPIS = 8;



        // Up to 4 active VPNs/IWLAN with potential soft handover.

        public static final int MAX_NUM_TUNNEL_INTERFACES = 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