Merge "Dynamically load statsd-service" (eacd2154) · Commits · e / os / android_frameworks_base

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

+39 −7

Original line number	Diff line number	Diff line
		@@ -25,11 +25,14 @@ import android.os.SystemClock;
		import android.os.Trace;
		import android.os.UserHandle;
		import android.os.UserManagerInternal;
		import android.util.ArrayMap;
		import android.util.Slog;

		import com.android.server.SystemService.TargetUser;
		import com.android.server.utils.TimingsTraceAndSlog;

		import dalvik.system.PathClassLoader;

		import java.io.File;
		import java.lang.reflect.Constructor;
		import java.lang.reflect.InvocationTargetException;
		@@ -63,6 +66,9 @@ public class SystemServiceManager {
		// Services that should receive lifecycle events.
		private final ArrayList<SystemService> mServices = new ArrayList<SystemService>();

		// Map of paths to PathClassLoader, so we don't load the same path multiple times.
		private final ArrayMap<String, PathClassLoader> mLoadedPaths = new ArrayMap<>();

		private int mCurrentPhase = -1;

		private UserManagerInternal mUserManagerInternal;
		@@ -76,20 +82,46 @@ public class SystemServiceManager {
		*
		* @return The service instance.
		*/
		@SuppressWarnings("unchecked")
		public SystemService startService(String className) {
		final Class<SystemService> serviceClass;
		final Class<SystemService> serviceClass = loadClassFromLoader(className,
		this.getClass().getClassLoader());
		return startService(serviceClass);
		}

		/**
		* Starts a service by class name and a path that specifies the jar where the service lives.
		*
		* @return The service instance.
		*/
		public SystemService startServiceFromJar(String className, String path) {
		PathClassLoader pathClassLoader = mLoadedPaths.get(path);
		if (pathClassLoader == null) {
		// NB: the parent class loader should always be the system server class loader.
		// Changing it has implications that require discussion with the mainline team.
		pathClassLoader = new PathClassLoader(path, this.getClass().getClassLoader());
		mLoadedPaths.put(path, pathClassLoader);
		}
		final Class<SystemService> serviceClass = loadClassFromLoader(className, pathClassLoader);
		return startService(serviceClass);
		}

		/*
		* Loads and initializes a class from the given classLoader. Returns the class.
		*/
		@SuppressWarnings("unchecked")
		private static Class<SystemService> loadClassFromLoader(String className,
		ClassLoader classLoader) {
		try {
		serviceClass = (Class<SystemService>)Class.forName(className);
		return (Class<SystemService>) Class.forName(className, true, classLoader);
		} catch (ClassNotFoundException ex) {
		Slog.i(TAG, "Starting " + className);
		throw new RuntimeException("Failed to create service " + className
		+ ": service class not found, usually indicates that the caller should "
		+ " from class loader " + classLoader.toString() + ": service class not "
		+ "found, usually indicates that the caller should "
		+ "have called PackageManager.hasSystemFeature() to check whether the "
		+ "feature is available on this device before trying to start the "
		+ "services that implement it", ex);
		+ "services that implement it. Also ensure that the correct path for the "
		+ "classloader is supplied, if applicable.", ex);
		}
		return startService(serviceClass);
		}

		/**

services/java/com/android/server/SystemServer.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -213,6 +213,8 @@ public final class SystemServer {
		"com.android.server.print.PrintManagerService";
		private static final String COMPANION_DEVICE_MANAGER_SERVICE_CLASS =
		"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 STATS_COMPANION_LIFECYCLE_CLASS =
		"com.android.server.stats.StatsCompanion$Lifecycle";
		private static final String STATS_PULL_ATOM_SERVICE_CLASS =
		@@ -1980,7 +1982,8 @@ public final class SystemServer {

		// Statsd helper
		t.traceBegin("StartStatsCompanion");
		mSystemServiceManager.startService(STATS_COMPANION_LIFECYCLE_CLASS);
		mSystemServiceManager.startServiceFromJar(
		STATS_COMPANION_LIFECYCLE_CLASS, STATS_COMPANION_APEX_PATH);
		t.traceEnd();

		// Statsd pulled atoms