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

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

Merge "Relax IPsec resource count restrictions." am: 9b74d7aa am: bf4ac613 

Change-Id: Iac00f8db5358a3e3ecec848eafd25649bc33028c
parents a035b583 bf4ac613

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

+8 −4
Original line number Diff line number Diff line
@@ -360,10 +360,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