Merge "Start VcnManagementService after ConnectivityService" into sc-dev (136109f1) · Commits · e / os / android_frameworks_base

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

+18 −18

Original line number	Diff line number	Diff line
		@@ -1705,15 +1705,6 @@ public final class SystemServer implements Dumpable {
		}
		t.traceEnd();

		t.traceBegin("StartVcnManagementService");
		try {
		vcnManagement = VcnManagementService.create(context);
		ServiceManager.addService(Context.VCN_MANAGEMENT_SERVICE, vcnManagement);
		} catch (Throwable e) {
		reportWtf("starting VCN Management Service", e);
		}
		t.traceEnd();

		t.traceBegin("StartFontManagerService");
		mSystemServiceManager.startService(FontManagerService.Lifecycle.class);
		t.traceEnd();
		@@ -1815,6 +1806,15 @@ public final class SystemServer implements Dumpable {
		networkPolicy.bindConnectivityManager(connectivity);
		t.traceEnd();

		t.traceBegin("StartVcnManagementService");
		try {
		vcnManagement = VcnManagementService.create(context);
		ServiceManager.addService(Context.VCN_MANAGEMENT_SERVICE, vcnManagement);
		} catch (Throwable e) {
		reportWtf("starting VCN Management Service", e);
		}
		t.traceEnd();

		t.traceBegin("StartNsdService");
		try {
		serviceDiscovery = NsdService.create(context);
		@@ -2632,15 +2632,6 @@ public final class SystemServer implements Dumpable {
		reportWtf("making IpSec Service ready", e);
		}
		t.traceEnd();
		t.traceBegin("MakeVcnManagementServiceReady");
		try {
		if (vcnManagementF != null) {
		vcnManagementF.systemReady();
		}
		} catch (Throwable e) {
		reportWtf("making VcnManagementService ready", e);
		}
		t.traceEnd();
		t.traceBegin("MakeNetworkStatsServiceReady");
		try {
		if (networkStatsF != null) {
		@@ -2659,6 +2650,15 @@ public final class SystemServer implements Dumpable {
		reportWtf("making Connectivity Service ready", e);
		}
		t.traceEnd();
		t.traceBegin("MakeVcnManagementServiceReady");
		try {
		if (vcnManagementF != null) {
		vcnManagementF.systemReady();
		}
		} catch (Throwable e) {
		reportWtf("making VcnManagementService ready", e);
		}
		t.traceEnd();
		t.traceBegin("MakeNetworkPolicyServiceReady");
		try {
		if (networkPolicyF != null) {