Merge "Create service-connectivity.jar" am: bfceacea50 (b91257f5) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -898,6 +898,18 @@ public class ConnectivityManager {
		}
		}

		/**
		* @hide
		* TODO: Expose for SystemServer when becomes a module.
		*/
		public void systemReady() {
		try {
		mService.systemReady();
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Checks if a given type uses the cellular data connection.
		* This should be replaced in the future by a network property.

core/java/android/net/IConnectivityManager.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -233,4 +233,6 @@ interface IConnectivityManager

		void simulateDataStall(int detectionMethod, long timestampMillis, in Network network,
		in PersistableBundle extras);

		void systemReady();
		}

services/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ java_library {
		"services.voiceinteraction",
		"services.wifi",
		"service-blobstore",
		"service-connectivity",
		"service-jobscheduler",
		"android.hidl.base-V1.0-java",
		],

services/core/Android.bp

+48 −0

Original line number	Diff line number	Diff line
		filegroup {
		name: "services.core-sources",
		srcs: ["java/*/.java"],
		exclude_srcs: [":connectivity-service-srcs"],
		path: "java",
		visibility: ["//frameworks/base/services"],
		}
		@@ -177,3 +178,50 @@ prebuilt_etc {
		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",
		],
		}

services/core/java/com/android/server/ConnectivityService.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -2300,10 +2300,21 @@ public class ConnectivityService extends IConnectivityManager.Stub
		}

		/**
		* Called when the system is ready and ConnectivityService can initialize remaining components.
		* Called by SystemServer through ConnectivityManager when the system is ready.
		*/
		@VisibleForTesting
		@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 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