diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-02-23 22:56:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-23 22:56:46 +0000 |
| commit | 5c05ff4fcec4af18ba51689f88ca14c500035b95 (patch) | |
| tree | 1d7e088eb56ab686bdc6ef8456a7272542615587 /services/java/com | |
| parent | 5ff0e890d4c1d503b895b840bb66e93312a06e62 (diff) | |
| parent | 07d4708ab7ce1c5a7cc21d0df90c2369c3b217b7 (diff) | |
Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 654b0fff63 am: d319fef084 am: 07d4708ab7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553736
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I032e3d8f16b164f067dba02bde950b93f4e54b83
Diffstat (limited to 'services/java/com')
| -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 dd2dd8150165..2bb5798fba2d 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1785,7 +1785,7 @@ public final class SystemServer implements Dumpable { 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); |