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

Commit c6dc74ed authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nearby_tethering_apex" 

* changes:
  Remove nearby API surface
  Revert "Start NearbyService when system server starts."
parents 5f73621d 0b692d5b

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -169,7 +169,6 @@ java_library_with_nonpublic_deps { 
        "framework-statsd.impl",

        "framework-supplementalprocess.impl",

        "framework-tethering.impl",

        "framework-nearby.impl",

        "framework-uwb.impl",

        "framework-wifi.impl",

        "updatable-media",

api/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ combined_apis { 
        "framework-graphics",

        "framework-media",

        "framework-mediaprovider",

        "framework-nearby",

        "framework-permission",

        "framework-permission-s",

        "framework-scheduling",

boot/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ platform_bootclasspath { 
            apex: "com.android.mediaprovider",

            module: "com.android.mediaprovider-bootclasspath-fragment",

        },

        {

            apex: "com.android.nearby",

            module: "com.android.nearby-bootclasspath-fragment",

        },

        {

            apex: "com.android.os.statsd",

            module: "com.android.os.statsd-bootclasspath-fragment",

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

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