Create service-connectivity.jar
Create a new target service-connectivity to split
ConnectivityService from services.core.
Add ConnectivityServiceInitializer for initializing
ConnectivityService and add systemReady() in
ConnectivityManager so that SystemServer can call systemReady()
through ConnectivityManager which won't change current behavior.
Bug: 158268939
Test: make target-java, make host-java
atest FrameworksNetIntegrationTests
atest FrameworksNetTests
make, device can boot,
atest CtsStrictJavaPackagesTestCases
wifi and mobile data work.
Change-Id: Ie732bfaf381404af0bb599ca2f421a96e7aa4257
diff --git a/services/Android.bp b/services/Android.bp
index 33205c0..8c9c487 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -92,6 +92,7 @@
"services.voiceinteraction",
"services.wifi",
"service-blobstore",
+ "service-connectivity",
"service-jobscheduler",
"android.hidl.base-V1.0-java",
],
diff --git a/services/core/Android.bp b/services/core/Android.bp
index 26c28d5..bec5120 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -1,6 +1,7 @@
filegroup {
name: "services.core-sources",
srcs: ["java/**/*.java"],
+ exclude_srcs: [":connectivity-service-srcs"],
path: "java",
visibility: [
"//frameworks/base/services",
@@ -166,3 +167,50 @@
name: "protolog.conf.json.gz",
src: ":services.core.json.gz",
}
+
+// TODO: Move connectivity service sources to independent directory.
+filegroup {
+ name: "connectivity-service-srcs",
+ srcs: [
+ "java/com/android/server/ConnectivityService.java",
+ "java/com/android/server/ConnectivityServiceInitializer.java",
+ "java/com/android/server/TestNetworkService.java",
+ "java/com/android/server/connectivity/AutodestructReference.java",
+ "java/com/android/server/connectivity/ConnectivityConstants.java",
+ "java/com/android/server/connectivity/DataConnectionStats.java",
+ "java/com/android/server/connectivity/DefaultNetworkMetrics.java",
+ "java/com/android/server/connectivity/DnsManager.java",
+ "java/com/android/server/connectivity/IpConnectivityEventBuilder.java",
+ "java/com/android/server/connectivity/IpConnectivityMetrics.java",
+ "java/com/android/server/connectivity/KeepaliveTracker.java",
+ "java/com/android/server/connectivity/LingerMonitor.java",
+ "java/com/android/server/connectivity/MockableSystemProperties.java",
+ "java/com/android/server/connectivity/MultipathPolicyTracker.java",
+ "java/com/android/server/connectivity/Nat464Xlat.java",
+ "java/com/android/server/connectivity/NetdEventListenerService.java",
+ "java/com/android/server/connectivity/NetworkAgentInfo.java",
+ "java/com/android/server/connectivity/NetworkDiagnostics.java",
+ "java/com/android/server/connectivity/NetworkNotificationManager.java",
+ "java/com/android/server/connectivity/NetworkRanker.java",
+ "java/com/android/server/connectivity/PermissionMonitor.java",
+ "java/com/android/server/connectivity/ProxyTracker.java",
+ "java/com/android/server/connectivity/TcpKeepaliveController.java",
+ "java/com/android/server/connectivity/Vpn.java",
+ "java/com/android/server/connectivity/VpnIkev2Utils.java",
+ "java/com/android/server/net/LockdownVpnTracker.java",
+ ],
+}
+
+java_library {
+ name: "service-connectivity",
+ srcs: [
+ ":connectivity-service-srcs",
+ ],
+ installable: true,
+ libs: [
+ "android.net.ipsec.ike",
+ "services.core",
+ "services.net",
+ "unsupportedappusage",
+ ],
+}
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index bb9f6d2..fc6abc8 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2301,10 +2301,21 @@
}
/**
- * Called when the system is ready and ConnectivityService can initialize remaining components.
+ * Called by SystemServer through ConnectivityManager when the system is ready.
+ */
+ @Override
+ public void systemReady() {
+ if (Binder.getCallingUid() != Process.SYSTEM_UID) {
+ throw new SecurityException("Calling Uid is not system uid.");
+ }
+ systemReadyInternal();
+ }
+
+ /**
+ * Called when ConnectivityService can initialize remaining components.
*/
@VisibleForTesting
- public void systemReady() {
+ public void systemReadyInternal() {
// Let PermissionMonitor#startMonitoring() running in the beginning of the systemReady
// before MultipathPolicyTracker.start(). Since mApps in PermissionMonitor needs to be
// populated first to ensure that listening network request which is sent by
diff --git a/services/core/java/com/android/server/ConnectivityServiceInitializer.java b/services/core/java/com/android/server/ConnectivityServiceInitializer.java
new file mode 100644
index 0000000..2bc8925
--- /dev/null
+++ b/services/core/java/com/android/server/ConnectivityServiceInitializer.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.server;
+
+import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_HIGH;
+import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;
+
+import android.content.Context;
+import android.net.INetworkPolicyManager;
+import android.net.INetworkStatsService;
+import android.os.INetworkManagementService;
+import android.os.ServiceManager;
+import android.util.Log;
+
+/**
+ * Connectivity service initializer for core networking. This is called by system server to create
+ * a new instance of ConnectivityService.
+ */
+public final class ConnectivityServiceInitializer extends SystemService {
+ private static final String TAG = ConnectivityServiceInitializer.class.getSimpleName();
+ private final ConnectivityService mConnectivity;
+
+ public ConnectivityServiceInitializer(Context context) {
+ super(context);
+ // TODO: Define formal APIs to get the needed services.
+ mConnectivity = new ConnectivityService(context, getNetworkManagementService(),
+ getNetworkStatsService(), getNetworkPolicyManager());
+ }
+
+ @Override
+ public void onStart() {
+ Log.i(TAG, "Registering " + Context.CONNECTIVITY_SERVICE);
+ publishBinderService(Context.CONNECTIVITY_SERVICE, mConnectivity,
+ /* allowIsolated= */ false, DUMP_FLAG_PRIORITY_HIGH | DUMP_FLAG_PRIORITY_NORMAL);
+ }
+
+ private INetworkManagementService getNetworkManagementService() {
+ return INetworkManagementService.Stub.asInterface(
+ ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE));
+ }
+
+ private INetworkStatsService getNetworkStatsService() {
+ return INetworkStatsService.Stub.asInterface(
+ ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
+ }
+
+ private INetworkPolicyManager getNetworkPolicyManager() {
+ return INetworkPolicyManager.Stub.asInterface(
+ ServiceManager.getService(Context.NETWORK_POLICY_SERVICE));
+ }
+
+}
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 275d8f1..975e226 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -47,7 +47,9 @@
import android.database.sqlite.SQLiteGlobal;
import android.graphics.GraphicsStatsService;
import android.hardware.display.DisplayManagerInternal;
+import android.net.ConnectivityManager;
import android.net.ConnectivityModuleConnector;
+import android.net.IConnectivityManager;
import android.net.NetworkStackClient;
import android.os.BaseBundle;
import android.os.Binder;
@@ -103,7 +105,6 @@
import com.android.server.clipboard.ClipboardService;
import com.android.server.compat.PlatformCompat;
import com.android.server.compat.PlatformCompatNative;
-import com.android.server.connectivity.IpConnectivityMetrics;
import com.android.server.contentcapture.ContentCaptureManagerInternal;
import com.android.server.coverage.CoverageService;
import com.android.server.devicepolicy.DevicePolicyManagerService;
@@ -320,6 +321,10 @@
"com.android.server.media.MediaSessionService";
private static final String MEDIA_RESOURCE_MONITOR_SERVICE_CLASS =
"com.android.server.media.MediaResourceMonitorService";
+ private static final String CONNECTIVITY_SERVICE_INITIALIZER_CLASS =
+ "com.android.server.ConnectivityServiceInitializer";
+ private static final String IP_CONNECTIVITY_METRICS_CLASS =
+ "com.android.server.connectivity.IpConnectivityMetrics";
private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";
@@ -1038,7 +1043,7 @@
IpSecService ipSecService = null;
NetworkStatsService networkStats = null;
NetworkPolicyManagerService networkPolicy = null;
- ConnectivityService connectivity = null;
+ IConnectivityManager connectivity = null;
NsdService serviceDiscovery = null;
WindowManagerService wm = null;
SerialService serial = null;
@@ -1228,7 +1233,7 @@
}
t.traceBegin("IpConnectivityMetrics");
- mSystemServiceManager.startService(IpConnectivityMetrics.class);
+ mSystemServiceManager.startService(IP_CONNECTIVITY_METRICS_CLASS);
t.traceEnd();
t.traceBegin("NetworkWatchlistService");
@@ -1572,16 +1577,15 @@
}
t.traceBegin("StartConnectivityService");
- try {
- connectivity = new ConnectivityService(
- context, networkManagement, networkStats, networkPolicy);
- ServiceManager.addService(Context.CONNECTIVITY_SERVICE, connectivity,
- /* allowIsolated= */ false,
- DUMP_FLAG_PRIORITY_HIGH | DUMP_FLAG_PRIORITY_NORMAL);
- networkPolicy.bindConnectivityManager(connectivity);
- } catch (Throwable e) {
- reportWtf("starting Connectivity Service", e);
- }
+ // 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);
+ connectivity = IConnectivityManager.Stub.asInterface(
+ ServiceManager.getService(Context.CONNECTIVITY_SERVICE));
+ // TODO: Use ConnectivityManager instead of ConnectivityService.
+ networkPolicy.bindConnectivityManager(connectivity);
t.traceEnd();
t.traceBegin("StartNsdService");
@@ -2270,7 +2274,6 @@
final NetworkManagementService networkManagementF = networkManagement;
final NetworkStatsService networkStatsF = networkStats;
final NetworkPolicyManagerService networkPolicyF = networkPolicy;
- final ConnectivityService connectivityF = connectivity;
final CountryDetectorService countryDetectorF = countryDetector;
final NetworkTimeUpdateService networkTimeUpdaterF = networkTimeUpdater;
final InputManagerService inputManagerF = inputManager;
@@ -2279,6 +2282,8 @@
final MmsServiceBroker mmsServiceF = mmsService;
final IpSecService ipSecServiceF = ipSecService;
final WindowManagerService windowManagerF = wm;
+ final ConnectivityManager connectivityF = (ConnectivityManager)
+ context.getSystemService(Context.CONNECTIVITY_SERVICE);
// We now tell the activity manager it is okay to run third party
// code. It will call back into us once it has gotten to the state