Merge "Start NetworkStack on system server start" am: 394b0d1a04 am: d69c3d4193

am: 8d73c6ec16 Change-Id: I0c116a73bfb8ab82c798ebdf0ab587f00be031ed
2018-12-25 23:53:40 -08:00
parent aef19af34f 8d73c6ec16
commit 46d40a2b83
1 changed files with 10 additions and 0 deletions
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -1264,6 +1264,16 @@ public final class SystemServer {
            }
            traceEnd();

+            traceBeginAndSlog("StartNetworkStack");
+            try {
+                final android.net.NetworkStack networkStack =
+                        context.getSystemService(android.net.NetworkStack.class);
+                networkStack.start(context);
+            } catch (Throwable e) {
+                reportWtf("starting Network Stack", e);
+            }
+            traceEnd();
+
            traceBeginAndSlog("StartNsdService");
            try {
                serviceDiscovery = NsdService.create(context);