Merge "Make grant origin tracing more ergonomic" (4485bf80) · Commits · e / os / android_frameworks_base

core/java/android/app/ApplicationPackageManager.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ public class ApplicationPackageManager extends PackageManager {
		* @hide
		*/
		public static final boolean DEBUG_TRACE_GRANTS = false;
		public static final boolean DEBUG_TRACE_PERMISSION_UPDATES = false;

		private static final int DEFAULT_EPHEMERAL_COOKIE_MAX_SIZE_BYTES = 16384; // 16KB

		@@ -690,7 +691,7 @@ public class ApplicationPackageManager extends PackageManager {
		UserHandle user) {
		if (DEBUG_TRACE_GRANTS
		&& shouldTraceGrant(packageName, permissionName, user.getIdentifier())) {
		Log.i(TAG, "App " + mContext.getPackageName() + " is granting "
		Log.i(TAG, "App " + mContext.getPackageName() + " is granting " + packageName + " "
		+ permissionName + " for user " + user.getIdentifier(), new RuntimeException());
		}
		try {
		@@ -708,9 +709,9 @@ public class ApplicationPackageManager extends PackageManager {

		@Override
		public void revokeRuntimePermission(String packageName, String permName, UserHandle user) {
		if (DEBUG_TRACE_GRANTS
		if (DEBUG_TRACE_PERMISSION_UPDATES
		&& shouldTraceGrant(packageName, permName, user.getIdentifier())) {
		Log.i(TAG, "App " + mContext.getPackageName() + " is revoking "
		Log.i(TAG, "App " + mContext.getPackageName() + " is revoking " + packageName + " "
		+ permName + " for user " + user.getIdentifier(), new RuntimeException());
		}
		try {
		@@ -734,9 +735,10 @@ public class ApplicationPackageManager extends PackageManager {
		@Override
		public void updatePermissionFlags(String permName, String packageName,
		int flagMask, int flagValues, UserHandle user) {
		if (DEBUG_TRACE_GRANTS
		if (DEBUG_TRACE_PERMISSION_UPDATES
		&& shouldTraceGrant(packageName, permName, user.getIdentifier())) {
		Log.i(TAG, "App " + mContext.getPackageName() + " is updating flags for "
		+ packageName + " "
		+ permName + " for user " + user.getIdentifier() + ": "
		+ DebugUtils.flagsToString(PackageManager.class, "FLAG_PERMISSION_", flagMask)
		+ " := " + DebugUtils.flagsToString(

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -650,9 +650,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		private void updatePermissionFlagsInternal(String permName, String packageName, int flagMask,
		int flagValues, int callingUid, int userId, boolean overridePolicy,
		PermissionCallback callback) {
		if (ApplicationPackageManager.DEBUG_TRACE_GRANTS
		if (ApplicationPackageManager.DEBUG_TRACE_PERMISSION_UPDATES
		&& ApplicationPackageManager.shouldTraceGrant(packageName, permName, userId)) {
		Log.i(TAG, "System is updating flags for "
		Log.i(TAG, "System is updating flags for " + packageName + " "
		+ permName + " for user " + userId + " "
		+ DebugUtils.flagsToString(
		PackageManager.class, "FLAG_PERMISSION_", flagMask)
		@@ -1185,7 +1185,7 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		boolean overridePolicy, int callingUid, final int userId, PermissionCallback callback) {
		if (ApplicationPackageManager.DEBUG_TRACE_GRANTS
		&& ApplicationPackageManager.shouldTraceGrant(packageName, permName, userId)) {
		Log.i(TAG, "System is granting "
		Log.i(TAG, "System is granting " + packageName + " "
		+ permName + " for user " + userId + " on behalf of uid " + callingUid
		+ " " + mPackageManagerInt.getNameForUid(callingUid),
		new RuntimeException());
		@@ -1345,9 +1345,9 @@ public class PermissionManagerService extends IPermissionManager.Stub {
		// TODO swap permission name and package name
		private void revokeRuntimePermissionInternal(String permName, String packageName,
		boolean overridePolicy, int callingUid, final int userId, PermissionCallback callback) {
		if (ApplicationPackageManager.DEBUG_TRACE_GRANTS
		if (ApplicationPackageManager.DEBUG_TRACE_PERMISSION_UPDATES
		&& ApplicationPackageManager.shouldTraceGrant(packageName, permName, userId)) {
		Log.i(TAG, "System is revoking "
		Log.i(TAG, "System is revoking " + packageName + " "
		+ permName + " for user " + userId + " on behalf of uid " + callingUid
		+ " " + mPackageManagerInt.getNameForUid(callingUid),
		new RuntimeException());