diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-01-12 03:42:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-12 03:42:16 +0000 |
| commit | 2f01d3d29db9450d3f993478dc4c4140cff4313b (patch) | |
| tree | 5fd224a55389f1e94ed2ff2c034e465cb695c18d /services/java/com/android/server | |
| parent | 4cd3f32ec7bd93d0099c74b81d1e36f59a85be1f (diff) | |
| parent | ce98a47a895f04088831f21848c3ff3f123ea5c8 (diff) | |
Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: 2f0fafeb11 am: f931a80e81 am: ce98a47a89
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81a7577b0cf474bbb53ca38ddd093ba4342ab543
Diffstat (limited to 'services/java/com/android/server')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 4d15ced48c83..d9350f39ee58 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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 = @@ -1356,7 +1358,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"); @@ -1721,8 +1724,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. |