Merge "SystemServer: reorder wifi services start" (b7a77d24) · Commits · e / os / android_frameworks_base

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

+15 −13

Original line number	Diff line number	Diff line
		@@ -955,6 +955,21 @@ public final class SystemServer {
		}
		traceEnd();

		// Wifi Service must be started first for wifi-related services.
		traceBeginAndSlog("StartWifi");
		mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
		traceEnd();
		traceBeginAndSlog("StartWifiScanning");
		mSystemServiceManager.startService(
		"com.android.server.wifi.scanner.WifiScanningService");
		traceEnd();

		if (!disableRtt) {
		traceBeginAndSlog("StartWifiRtt");
		mSystemServiceManager.startService("com.android.server.wifi.RttService");
		traceEnd();
		}

		if (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_WIFI_AWARE)) {
		traceBeginAndSlog("StartWifiAware");
		@@ -970,19 +985,6 @@ public final class SystemServer {
		mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);
		traceEnd();
		}
		traceBeginAndSlog("StartWifi");
		mSystemServiceManager.startService(WIFI_SERVICE_CLASS);
		traceEnd();
		traceBeginAndSlog("StartWifiScanning");
		mSystemServiceManager.startService(
		"com.android.server.wifi.scanner.WifiScanningService");
		traceEnd();

		if (!disableRtt) {
		traceBeginAndSlog("StartWifiRtt");
		mSystemServiceManager.startService("com.android.server.wifi.RttService");
		traceEnd();
		}

		if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) \|\|
		mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {