diff options
| author | 2020-03-25 05:01:20 +0000 | |
|---|---|---|
| committer | 2020-03-25 05:01:20 +0000 | |
| commit | 9110937f1a202be7f6b4a226c0ea013e7a0fd329 (patch) | |
| tree | 7c9a5782ff0970ac3651e91e4223e38c320aafc6 /services/java | |
| parent | 5bcefb542656340818fd2b910031c9f872f0b2fe (diff) | |
| parent | 8c9064e86ec25f1c10ca0bc0cb282f61d34493e6 (diff) | |
Merge "Automatically set IPsec tunnel interface as up" am: 7df882e039 am: 8c9064e86e
Change-Id: I01d10d2e1c0fcc52b88901609fae068d6d5268f7
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 2 |
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 d1a1955df69d..7263f19d94f8 100644 --- 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); |