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

Merge "Move NetworkStack start to AM.systemReady"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2019-03-12 05:27:33 +00:00
committed by Gerrit Code Review
parent 47890345d0 c7054c5e20
commit f9cca7dcc2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/java/com/android/server/SystemServer.java
View File

@@ -1241,14 +1241,6 @@ public final class SystemServer {
} }
traceEnd(); traceEnd();
traceBeginAndSlog("StartNetworkStack");
try {
NetworkStackClient.getInstance().start(context);
} catch (Throwable e) {
reportWtf("starting Network Stack", e);
}
traceEnd();
traceBeginAndSlog("StartNsdService"); traceBeginAndSlog("StartNsdService");
try { try {
serviceDiscovery = NsdService.create(context); serviceDiscovery = NsdService.create(context);
@@ -1931,6 +1923,14 @@ public final class SystemServer {
SystemService.PHASE_THIRD_PARTY_APPS_CAN_START); SystemService.PHASE_THIRD_PARTY_APPS_CAN_START);
traceEnd(); traceEnd();
traceBeginAndSlog("StartNetworkStack");
try {
NetworkStackClient.getInstance().start(context);
} catch (Throwable e) {
reportWtf("starting Network Stack", e);
}
traceEnd();
traceBeginAndSlog("MakeLocationServiceReady"); traceBeginAndSlog("MakeLocationServiceReady");
try { try {
if (locationF != null) locationF.systemRunning(); if (locationF != null) locationF.systemRunning();