Merge "Automatically set IPsec tunnel interface as up"

2020-03-25 04:18:50 +00:00
parent 2a4a88c625 041bdf883a
commit 7df882e039
5 changed files with 36 additions and 14 deletions
--- 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);