From c7054c5e2083ef37e65d53e18cfb80940729d5ae Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 12 Mar 2019 11:50:22 +0900 Subject: Move NetworkStack start to AM.systemReady In practice the NetworkStack was not started after ActivityManager#systemReady, since ActivityManager was only scheduling the start (mPendingStarts). Requesting the start too early causes issues for the PackageManager to install updates/rollbacks. Test: flashed AOSP and internal builds, WiFi working Bug: 128331883 Change-Id: I93315ad31925bd436e21d1eabb21d5967e6aae60 --- services/java/com/android/server/SystemServer.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'services/java/com') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 6cbb35b152c5..477e34df182e 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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); @@ -1944,6 +1936,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(); -- cgit v1.2.3-59-g8ed1b