Add Per-User logging of UsageStats (3c153519) · Commits · e / os / android_frameworks_base

core/java/android/app/usage/UsageStatsManagerInternal.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -29,11 +29,13 @@ public abstract class UsageStatsManagerInternal {
		* Reports an event to the UsageStatsManager.
		*
		* @param component The component for which this event ocurred.
		* @param userId The user id to which the component belongs to.
		* @param timeStamp The time at which this event ocurred.
		* @param eventType The event that occured. Valid values can be found at
		* {@link android.app.usage.UsageStats.Event}
		*/
		public abstract void reportEvent(ComponentName component, long timeStamp, int eventType);
		public abstract void reportEvent(ComponentName component, int userId,
		long timeStamp, int eventType);

		/**
		* Prepares the UsageStatsService for shutdown.

+4 −2

Original line number	Diff line number	Diff line
		@@ -3098,7 +3098,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		final BatteryStatsImpl stats = mBatteryStatsService.getActiveStatistics();
		if (resumed) {
		if (mUsageStatsService != null) {
		mUsageStatsService.reportEvent(component.realActivity, System.currentTimeMillis(),
		mUsageStatsService.reportEvent(component.realActivity, component.userId,
		System.currentTimeMillis(),
		UsageStats.Event.MOVE_TO_FOREGROUND);
		}
		synchronized (stats) {
		@@ -3106,7 +3107,8 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		} else {
		if (mUsageStatsService != null) {
		mUsageStatsService.reportEvent(component.realActivity, System.currentTimeMillis(),
		mUsageStatsService.reportEvent(component.realActivity, component.userId,
		System.currentTimeMillis(),
		UsageStats.Event.MOVE_TO_BACKGROUND);
		}
		synchronized (stats) {

+3 −4

Original line number	Diff line number	Diff line
		@@ -352,6 +352,9 @@ public final class SystemServer {
		mFirstBoot = mPackageManagerService.isFirstBoot();
		mPackageManager = mSystemContext.getPackageManager();

		Slog.i(TAG, "User Service");
		ServiceManager.addService(Context.USER_SERVICE, UserManagerService.getInstance());

		// Initialize attribute cache used to cache resources from packages.
		AttributeCache.init(mSystemContext);

		@@ -434,10 +437,6 @@ public final class SystemServer {
		Slog.i(TAG, "Entropy Mixer");
		ServiceManager.addService("entropy", new EntropyMixer(context));

		Slog.i(TAG, "User Service");
		ServiceManager.addService(Context.USER_SERVICE,
		UserManagerService.getInstance());

		mContentResolver = context.getContentResolver();

		// The AccountManager must come before the ContentService

+126 −233

File changed.

Preview size limit exceeded, changes collapsed.

0 → 100644

+275 −0

File added.

Preview size limit exceeded, changes collapsed.