Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use INetd Constant for IpSec Interface Prefix"

Browse Source 
am: 05a16e8a04

Change-Id: If5a0507e6aa2dfa2af7c69d1ec26ff9b48f3baf7
This commit is contained in:
nharold
2018-05-14 20:55:41 -07:00
committed by android-build-merger
parent 2743c5bb09 05a16e8a04
commit e651d67bcb
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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: