commit 8cba3b9e97fbd82822ec2cba9c7ebe53369ad070
author Nathan Harold <nharold@google.com> Wed May 09 17:27:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 09 17:27:13 2018 +0000
tree 9a6a22ce607e4b849db379a6c8b30b10aa122e9a
parent aa26f736e4145647527071ec7726e770a3f96215
parent e6f4604404b1f52cebe8207c7155234f729363f5

Merge "[DO NOT MERGE] Use INetd Constant for IpSec Interface Prefix" into pi-dev

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

diff --git a/services/core/java/com/android/server/IpSecService.java b/services/core/java/com/android/server/IpSecService.java
index 33ca02f..60f1877 100644
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -107,7 +107,6 @@
 
     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 @@
         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: