Merge "Start VcnManagementService after ConnectivityService" (1595b1aa) · Commits · e / os / android_frameworks_base

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

+18 −18

Original line number	Diff line number	Diff line
		@@ -1533,15 +1533,6 @@ public final class SystemServer {
		}
		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("StartTextServicesManager");
		mSystemServiceManager.startService(TextServicesManagerService.Lifecycle.class);
		t.traceEnd();
		@@ -1639,6 +1630,15 @@ public final class SystemServer {
		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);
		@@ -2415,15 +2415,6 @@ public final class SystemServer {
		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) {
		@@ -2442,6 +2433,15 @@ public final class SystemServer {
		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) {