From d0cd7a5f739f6bd397045cd91b0e28bd31539873 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Fri, 21 Jan 2022 07:43:04 +0000 Subject: Revert "Start NearbyService when system server starts." This reverts commit 0fc06be8cad5d2080e25e37f40ae98376ef26021. Reason for revert: The original change is fine, but is not be necessary anymore once the service is started from the Connectivity initializer. This is to be submitted together with changes achieving that. Bug: 189355156 Bug: 214495869 Test: check service started from new path Change-Id: I26e1a89522f7a8ce72e7576a1f2f697845eef617 --- services/java/com/android/server/SystemServer.java | 14 -------------- 1 file changed, 14 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 74e04ed6e58b..aad1bf8ab7c3 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -265,8 +265,6 @@ public final class SystemServer implements Dumpable { "/apex/com.android.os.statsd/javalib/service-statsd.jar"; private static final String CONNECTIVITY_SERVICE_APEX_PATH = "/apex/com.android.tethering/javalib/service-connectivity.jar"; - private static final String NEARBY_SERVICE_APEX_PATH = - "/apex/com.android.nearby/javalib/service-nearby.jar"; private static final String STATS_COMPANION_LIFECYCLE_CLASS = "com.android.server.stats.StatsCompanion$Lifecycle"; private static final String STATS_PULL_ATOM_SERVICE_CLASS = @@ -277,8 +275,6 @@ public final class SystemServer implements Dumpable { "com.android.server.usb.UsbService$Lifecycle"; private static final String MIDI_SERVICE_CLASS = "com.android.server.midi.MidiService$Lifecycle"; - private static final String NEARBY_SERVICE_CLASS = - "com.android.server.nearby.NearbyService"; private static final String WIFI_APEX_SERVICE_JAR_PATH = "/apex/com.android.wifi/javalib/service-wifi.jar"; private static final String WIFI_SERVICE_CLASS = @@ -2000,16 +1996,6 @@ public final class SystemServer implements Dumpable { } t.traceEnd(); - // Start Nearby Service. - t.traceBegin("StartNearbyService"); - try { - mSystemServiceManager.startServiceFromJar(NEARBY_SERVICE_CLASS, - NEARBY_SERVICE_APEX_PATH); - } catch (Throwable e) { - reportWtf("starting NearbyService", e); - } - t.traceEnd(); - t.traceBegin("StartConnectivityService"); // This has to be called after NetworkManagementService, NetworkStatsService // and NetworkPolicyManager because ConnectivityService needs to take these -- cgit v1.2.3-59-g8ed1b