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

Merge "Move NetworkStack start to AM.systemReady" am: f9cca7dcc2 am: 1091513f93

Browse Source 
am: 8f2af18c51

Change-Id: Ibdeef12797eb06fd67dc132e2f3e5a6ad06b38a1
This commit is contained in:
Remi NGUYEN VAN
2019-03-11 22:56:17 -07:00
committed by android-build-merger
parent 306541b2eb 8f2af18c51
commit e5c398c799
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

@@ -1373,14 +1373,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);
@@ -2143,6 +2135,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) {