Merge "SystemServer: Support Wifi and WifiScanning for ARC" into main (81702c5e) · Commits · e / os / android_frameworks_base

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

+20 −7

Original line number	Diff line number	Diff line
		@@ -269,6 +269,8 @@ public final class SystemServer implements Dumpable {
		"com.android.server.backup.BackupManagerService$Lifecycle";
		private static final String APPWIDGET_SERVICE_CLASS =
		"com.android.server.appwidget.AppWidgetService";
		private static final String ARC_NETWORK_SERVICE_CLASS =
		"com.android.server.arc.net.ArcNetworkService";
		private static final String ARC_PERSISTENT_DATA_BLOCK_SERVICE_CLASS =
		"com.android.server.arc.persistent_data_block.ArcPersistentDataBlockService";
		private static final String ARC_SYSTEM_HEALTH_SERVICE =
		@@ -2069,6 +2071,7 @@ public final class SystemServer implements Dumpable {
		if (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_WIFI)) {
		// Wifi Service must be started first for wifi-related services.
		if (!isArc) {
		t.traceBegin("StartWifi");
		mSystemServiceManager.startServiceFromJar(
		WIFI_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH);
		@@ -2078,6 +2081,16 @@ public final class SystemServer implements Dumpable {
		WIFI_SCANNING_SERVICE_CLASS, WIFI_APEX_SERVICE_JAR_PATH);
		t.traceEnd();
		}
		}

		// ARC - ArcNetworkService registers the ARC network stack and replaces the
		// stock WiFi service in both ARC++ container and ARCVM. Always starts the ARC network
		// stack regardless of whether FEATURE_WIFI is enabled/disabled (b/254755875).
		if (isArc) {
		t.traceBegin("StartArcNetworking");
		mSystemServiceManager.startService(ARC_NETWORK_SERVICE_CLASS);
		t.traceEnd();
		}

		if (context.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_WIFI_RTT)) {