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

Commit f9cca7dc authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Gerrit Code Review
Browse files

Merge "Move NetworkStack start to AM.systemReady"

parents 47890345 c7054c5e

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();