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

Commit eb176754 authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge "Use INetd Constant for IpSec Interface Prefix"

parents ef2b5b8a 0e84fb65

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

+1 −2
Original line number Diff line number Diff line
@@ -107,7 +107,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;
@@ -1270,7 +1269,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: