Merge "Initialize the NetworkStack before WiFi" am: 6d0186de88 am: b07d868c53 (e2993672) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -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);

+9 −2

Original line number	Diff line number	Diff line
		@@ -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