Merge changes from topic "nearby_tethering_apex"

* changes:
  Remove nearby API surface
  Revert "Start NearbyService when system server starts."

4 files changed, 0 insertions, 20 deletions

diff --git a/Android.bp b/Android.bp
index 838f304b2e8e..e03f8449891a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
diff --git a/api/Android.bp b/api/Android.bp
index 3075d385f1ca..d57f5dbdf948 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -116,7 +116,6 @@ combined_apis {
         "framework-graphics",
         "framework-media",
         "framework-mediaprovider",
-        "framework-nearby",
         "framework-permission",
         "framework-permission-s",
         "framework-scheduling",
diff --git a/boot/Android.bp b/boot/Android.bp
index 8958d70f63cf..55ffe7c3dda3 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -80,10 +80,6 @@ platform_bootclasspath {
             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",
         },
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