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

Merge "Start VcnManagementService after ConnectivityService" am: 1595b1aa38 am: 356c6725c6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6accd63f8570a944758596319689266837c1dc94
This commit is contained in:
Chalard Jean
2021-02-01 08:41:48 +00:00
committed by Automerger Merge Worker
parent a0927df3f1 356c6725c6
commit 8cb7e186cd
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

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