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

Commit 8f2af18c authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Move NetworkStack start to AM.systemReady" am: f9cca7dc 

am: 1091513f

Change-Id: Ie86202fa755c1aa77938d82a7fbc3f2f39b42135
parents 952affa9 1091513f

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

+8 −8
Original line number Diff line number Diff line
@@ -1241,14 +1241,6 @@ public final class SystemServer { 
            }

            traceEnd();



            traceBeginAndSlog("StartNetworkStack");

            try {

                NetworkStackClient.getInstance().start(context);

            } catch (Throwable e) {

                reportWtf("starting Network Stack", e);

            }

            traceEnd();



            traceBeginAndSlog("StartNsdService");

            try {

                serviceDiscovery = NsdService.create(context);
@@ -1931,6 +1923,14 @@ public final class SystemServer { 
                    SystemService.PHASE_THIRD_PARTY_APPS_CAN_START);

            traceEnd();



            traceBeginAndSlog("StartNetworkStack");

            try {

                NetworkStackClient.getInstance().start(context);

            } catch (Throwable e) {

                reportWtf("starting Network Stack", e);

            }

            traceEnd();



            traceBeginAndSlog("MakeLocationServiceReady");

            try {

                if (locationF != null) locationF.systemRunning();