Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 919d9cc1 authored by Benedict Wong's avatar Benedict Wong
Browse files

Start VcnManagementService after ConnectivityService 

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

Bug: 174636568
Test: atest FrameworksVcnTests
Test: atest FrameworksNetTests
Change-Id: I1af29d52b94e77781eb2bf2082fcbe43648ee800
Merged-In: I1af29d52b94e77781eb2bf2082fcbe43648ee800
parent e4f60f7d

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

+18 −18
Original line number Diff line number Diff line
@@ -1460,15 +1460,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();
@@ -1566,6 +1557,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);
@@ -2336,15 +2336,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) {
@@ -2363,6 +2354,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) {