diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-02-23 22:46:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 22:46:54 +0000 |
| commit | 07d4708ab7ce1c5a7cc21d0df90c2369c3b217b7 (patch) | |
| tree | f0bd416c719ce8f9d23d39534a526dfe767dad98 /services/java/com/android/server/SystemServer.java | |
| parent | ec81e831f64bbbd3d9d5c6e84d61a0d9d9512a85 (diff) | |
| parent | d319fef084294d958c040835909e5b1562bfd48a (diff) | |
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 654b0fff63 am: d319fef084
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic520c715578c8c5dd70040bbdc4c535330b0a453
Diffstat (limited to 'services/java/com/android/server/SystemServer.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 c665ca32bff0..aa222cffc9a3 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1534,7 +1534,7 @@ public final class SystemServer { t.traceBegin("StartIpSecService"); try { - ipSecService = IpSecService.create(context, networkManagement); + ipSecService = IpSecService.create(context); ServiceManager.addService(Context.IPSEC_SERVICE, ipSecService); } catch (Throwable e) { reportWtf("starting IpSec Service", e); |