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

Merge changes from topic "connectivity_jar_in_apex" am: 60dfb880de am: 6feb97a95b am: 7a26ec1976

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49964ba08c0983cd51fa06afe0be07a5c9bfaab1
This commit is contained in:
Lorenzo Colitti
2021-01-07 10:10:11 +00:00
committed by Automerger Merge Worker
parent 1db8285fa3 7a26ec1976
commit f9ae26f742
8 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -237,6 +237,8 @@ public final class SystemServer implements Dumpable {
"com.android.server.companion.CompanionDeviceManagerService";
private static final String STATS_COMPANION_APEX_PATH =
"/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 STATS_COMPANION_LIFECYCLE_CLASS =
"com.android.server.stats.StatsCompanion$Lifecycle";
private static final String STATS_PULL_ATOM_SERVICE_CLASS =
@@ -1351,7 +1353,8 @@ public final class SystemServer implements Dumpable {
}
t.traceBegin("IpConnectivityMetrics");
mSystemServiceManager.startService(IP_CONNECTIVITY_METRICS_CLASS);
mSystemServiceManager.startServiceFromJar(IP_CONNECTIVITY_METRICS_CLASS,
CONNECTIVITY_SERVICE_APEX_PATH);
t.traceEnd();
t.traceBegin("NetworkWatchlistService");
@@ -1716,8 +1719,8 @@ public final class SystemServer implements Dumpable {
// This has to be called after NetworkManagementService, NetworkStatsService
// and NetworkPolicyManager because ConnectivityService needs to take these
// services to initialize.
// TODO: Dynamically load service-connectivity.jar by using startServiceFromJar.
mSystemServiceManager.startService(CONNECTIVITY_SERVICE_INITIALIZER_CLASS);
mSystemServiceManager.startServiceFromJar(CONNECTIVITY_SERVICE_INITIALIZER_CLASS,
CONNECTIVITY_SERVICE_APEX_PATH);
connectivity = IConnectivityManager.Stub.asInterface(
ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
// TODO: Use ConnectivityManager instead of ConnectivityService.