Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fc06be8 authored by Wei Wang's avatar Wei Wang Committed by Eric Lin
Browse files

Start NearbyService when system server starts. 

Bug: 189355156
Bug: 214495869
Test: manual
Change-Id: I41ecaf814efce374e8448f9cab3fce45c18862f0
parent 768e2313

services/java/com/android/server/SystemServer.java

+14 −0
Original line number Diff line number Diff line
@@ -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