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

am: b07d868c53

Change-Id: I65ed1eb721d194c34fc475b461b28386eee206e0

services/java/com/android/server/SystemServer.java

@@ -1118,6 +1118,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);

services/net/java/android/net/NetworkStackClient.java

@@ -164,6 +164,15 @@ public class NetworkStackClient {
         }
     }
 
+    /**
+     * Initialize the network stack. Should be called only once on device startup, before any
+     * client attempts to use the network stack.
+     */
+    public void init() {
+        log("Network stack init");
+        mNetworkStackStartRequested = true;
+    }
+
     /**
      * Start the network stack. Should be called only once on device startup.
      *
@@ -174,8 +183,6 @@ public class NetworkStackClient {
      */
     public void start(Context context) {
         log("Starting network stack");
-        mNetworkStackStartRequested = true;
-
         final PackageManager pm = context.getPackageManager();
 
         // Try to bind in-process if the device was shipped with an in-process version