Merge "Automatically set IPsec tunnel interface as up" am: 7df882e039 am: 8c9064e86e

Change-Id: I01d10d2e1c0fcc52b88901609fae068d6d5268f7
2020-03-25 05:01:20 +00:00
parent 5bcefb5426 8c9064e86e
commit 9110937f1a
5 changed files with 35 additions and 14 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1407,7 +1407,7 @@ public final class SystemServer {

            t.traceBegin("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);