Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Start VcnManagementService after ConnectivityService

Browse Source 
This change alters the start-up order of the VCN and Connectivity
services.

Bug: 174636568
Test: atest FrameworksVcnTests
Test: atest FrameworksNetTests
Change-Id: I1af29d52b94e77781eb2bf2082fcbe43648ee800
This commit is contained in:
Benedict Wong
2021-01-04 22:16:50 -08:00
parent 8f046c76d7
commit 3877b57b1d
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/java/com/android/server/SystemServer.java
View File

@@ -1705,15 +1705,6 @@ public final class SystemServer implements Dumpable {
} }
t.traceEnd(); 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"); t.traceBegin("StartFontManagerService");
mSystemServiceManager.startService(FontManagerService.Lifecycle.class); mSystemServiceManager.startService(FontManagerService.Lifecycle.class);
t.traceEnd(); t.traceEnd();
@@ -1815,6 +1806,15 @@ public final class SystemServer implements Dumpable {
networkPolicy.bindConnectivityManager(connectivity); networkPolicy.bindConnectivityManager(connectivity);
t.traceEnd(); 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"); t.traceBegin("StartNsdService");
try { try {
serviceDiscovery = NsdService.create(context); serviceDiscovery = NsdService.create(context);
@@ -2632,15 +2632,6 @@ public final class SystemServer implements Dumpable {
reportWtf("making IpSec Service ready", e); reportWtf("making IpSec Service ready", e);
} }
t.traceEnd(); t.traceEnd();
t.traceBegin("MakeVcnManagementServiceReady");
try {
if (vcnManagementF != null) {
vcnManagementF.systemReady();
}
} catch (Throwable e) {
reportWtf("making VcnManagementService ready", e);
}
t.traceEnd();
t.traceBegin("MakeNetworkStatsServiceReady"); t.traceBegin("MakeNetworkStatsServiceReady");
try { try {
if (networkStatsF != null) { if (networkStatsF != null) {
@@ -2659,6 +2650,15 @@ public final class SystemServer implements Dumpable {
reportWtf("making Connectivity Service ready", e); reportWtf("making Connectivity Service ready", e);
} }
t.traceEnd(); t.traceEnd();
t.traceBegin("MakeVcnManagementServiceReady");
try {
if (vcnManagementF != null) {
vcnManagementF.systemReady();
}
} catch (Throwable e) {
reportWtf("making VcnManagementService ready", e);
}
t.traceEnd();
t.traceBegin("MakeNetworkPolicyServiceReady"); t.traceBegin("MakeNetworkPolicyServiceReady");
try { try {
if (networkPolicyF != null) { if (networkPolicyF != null) {