Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "nearby_tethering_apex"

Browse Source 
* changes:
  Remove nearby API surface
  Revert "Start NearbyService when system server starts."
This commit is contained in:
Remi NGUYEN VAN
2022-01-31 04:25:49 +00:00
committed by Android (Google) Code Review
parent 5f73621d01 0b692d5b50
commit c6dc74ed9f
4 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -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",

1
api/Android.bp
View File

@@ -116,7 +116,6 @@ combined_apis {
"framework-graphics",
"framework-media",
"framework-mediaprovider",
"framework-nearby",
"framework-permission",
"framework-permission-s",
"framework-scheduling",

4
boot/Android.bp
View File

@@ -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",

14
services/java/com/android/server/SystemServer.java
View File

@@ -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