summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Benedict Wong <benedictwong@google.com> 2020-03-25 04:35:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-03-25 04:35:03 +0000
commit8c9064e86ec25f1c10ca0bc0cb282f61d34493e6 (patch)
treef442df4e9fbfe8e7f99109684702217f7f33bc9b /services/java
parent267039a3e70985fb89b74ad48089d82f878c50f8 (diff)
parent7df882e039e15d1efb2d9cf870d6d5b232d01f92 (diff)
Merge "Automatically set IPsec tunnel interface as up" am: 7df882e039
Change-Id: I068814590192decaf353cdd8c46cc7f65badc746
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 2b28ca228b1f..afa8c468cb48 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1328,7 +1328,7 @@ public final class SystemServer {
traceBeginAndSlog("StartIpSecService");
try {
- ipSecService = IpSecService.create(context);
+ ipSecService = IpSecService.create(context, networkManagement);
ServiceManager.addService(Context.IPSEC_SERVICE, ipSecService);
} catch (Throwable e) {
reportWtf("starting IpSec Service", e);