Merge "Start NetworkStack on system server start"

am: 394b0d1a04 Change-Id: I1f32ff38603d5a8480f90da0ef76bb3247910cd9
2018-12-25 23:32:08 -08:00
parent e1922923fc 394b0d1a04
commit d69c3d4193
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
@@ -1204,6 +1204,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);