From 0fc06be8cad5d2080e25e37f40ae98376ef26021 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Sun, 12 Sep 2021 21:15:48 -0700 Subject: [PATCH] Start NearbyService when system server starts. Bug: 189355156 Bug: 214495869 Test: manual Change-Id: I41ecaf814efce374e8448f9cab3fce45c18862f0 --- services/java/com/android/server/SystemServer.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index aa5b2095b97ce..3266e93d2734d 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -258,6 +258,8 @@ public final class SystemServer implements Dumpable { "com.android.server.scheduling.RebootReadinessManagerService$Lifecycle"; 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 = @@ -266,6 +268,8 @@ 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 = @@ -1927,6 +1931,16 @@ 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