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

Commit e651d67b authored by nharold's avatar nharold Committed by android-build-merger
Browse files

Merge "Use INetd Constant for IpSec Interface Prefix" 

am: 05a16e8a

Change-Id: If5a0507e6aa2dfa2af7c69d1ec26ff9b48f3baf7
parents 2743c5bb 05a16e8a

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

+1 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ public class IpSecService extends IIpSecService.Stub { 


    static final int FREE_PORT_MIN = 1024; // ports 1-1023 are reserved

    static final int PORT_MAX = 0xFFFF; // ports are an unsigned 16-bit integer

    static final String TUNNEL_INTERFACE_PREFIX = "ipsec";



    /* Binder context for this service */

    private final Context mContext;
@@ -1257,7 +1256,7 @@ public class IpSecService extends IIpSecService.Stub { 
        final int resourceId = mNextResourceId++;

        final int ikey = reserveNetId();

        final int okey = reserveNetId();

        String intfName = String.format("%s%d", TUNNEL_INTERFACE_PREFIX, resourceId);

        String intfName = String.format("%s%d", INetd.IPSEC_INTERFACE_PREFIX, resourceId);



        try {

            // Calls to netd: