Merge "Initialize the NetworkStack before WiFi" am: 6d0186de88 am: b07d868c53

am: 991b27b67b Change-Id: Ia92b6a8b9c2d23b5ea496fa0eca74de3292abd90
2019-03-14 21:12:47 -07:00
parent 152aeb1817 991b27b67b
commit e2993672d5
2 changed files with 17 additions and 2 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1247,6 +1247,14 @@ public final class SystemServer {
            mSystemServiceManager.startService(ClipboardService.class);
            traceEnd();

+            traceBeginAndSlog("InitNetworkStackClient");
+            try {
+                NetworkStackClient.getInstance().init();
+            } catch (Throwable e) {
+                reportWtf("initializing NetworkStackClient", e);
+            }
+            traceEnd();
+
            traceBeginAndSlog("StartNetworkManagementService");
            try {
                networkManagement = NetworkManagementService.create(context);