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

Commit 986799af authored by Benedict Wong's avatar Benedict Wong Committed by Automerger Merge Worker
Browse files

Merge "Start VcnManagementService after ConnectivityService" into sc-dev am: 136109f1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428696

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5425a8d7c29e4348b64072cb517a39fb8366734
parents 40db90c8 136109f1

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) {