diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-02-22 06:49:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-22 06:49:39 +0000 |
| commit | 654b0fff632ae7d52c0a4bcc498e68969f0f77d1 (patch) | |
| tree | 01dffd8a78b1d66a0df724d367eb2c45d97f4039 /services/java/com/android/server/SystemServer.java | |
| parent | 9203e5b94ad02ff8bd350220c5cad6189eab297c (diff) | |
| parent | 2b9ba7a1f6736bafdadbd93a8b6f4a6bc47f9105 (diff) | |
Merge changes I852e3a53,I86755647,I0ed8b0c6
* changes:
Remove unused INetworkManagementService from IpSecService
Use NetdUtils instead of NetworkManagementService in Vpn
Use NetdUtils instead of NetworkManagementService in IpSecService
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); |