From d0cd7a5f739f6bd397045cd91b0e28bd31539873 Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Fri, 21 Jan 2022 07:43:04 +0000
Subject: [PATCH 1/2] 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(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 74e04ed6e58b3..aad1bf8ab7c30 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

From 0b692d5b50434fbea095307434209e5faa06fcdf Mon Sep 17 00:00:00 2001
From: Remi NGUYEN VAN <reminv@google.com>
Date: Fri, 7 Jan 2022 13:15:46 +0900
Subject: [PATCH 2/2] Remove nearby API surface

It is being merged into the tethering/connectivity API surface, under
the existing framework-connectivity-t API.

Bug: 189355156
Test: m
Change-Id: I5878ffc1449f0eb19abdccd34d5c8ca1f711fbc8
---
 Android.bp      | 1 -
 api/Android.bp  | 1 -
 boot/Android.bp | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/Android.bp b/Android.bp
index 838f304b2e8e1..e03f8449891ab 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 3075d385f1ca1..d57f5dbdf9487 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 8958d70f63cf1..55ffe7c3dda3f 100644
--- a/boot/Android.bp
+++ b/boot/Android.bp
@@ -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",