Merge "Enforce INTERACT_ACROSS_USERS_FULL for cross-user event reports." into main (e509b838) · Commits · e / os / android_frameworks_base

services/usage/java/com/android/server/usage/UsageStatsService.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -2278,6 +2278,12 @@ public class UsageStatsService extends SystemService implements
		"Only the system or holders of the REPORT_USAGE_STATS"
		+ " permission are allowed to call reportUserInteraction");
		}
		if (userId != UserHandle.getCallingUserId()) {
		// Cross-user event reporting.
		getContext().enforceCallingPermission(
		Manifest.permission.INTERACT_ACROSS_USERS_FULL,
		"Caller doesn't have INTERACT_ACROSS_USERS_FULL permission");
		}
		} else {
		if (!isCallingUidSystem()) {
		throw new SecurityException("Only system is allowed to call"
		@@ -2287,7 +2293,8 @@ public class UsageStatsService extends SystemService implements

		// Verify if this package exists before reporting an event for it.
		if (mPackageManagerInternal.getPackageUid(packageName, 0, userId) < 0) {
		throw new IllegalArgumentException("Package " + packageName + "not exist!");
		throw new IllegalArgumentException("Package " + packageName
		+ " does not exist!");
		}

		final Event event = new Event(USER_INTERACTION, SystemClock.elapsedRealtime());