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 
am: f9cca7dcc2

Change-Id: I80776bcaf5888b7244f83a467bc7c67267ccfee0
This commit is contained in:
Remi NGUYEN VAN
2019-03-11 22:37:29 -07:00
committed by android-build-merger
parent 434096edef f9cca7dcc2
commit 1091513f93
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();
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();