Merge "Make sure parallel broadcasts enforce excluded permissions" into sc-dev (3f015cbc) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/BroadcastQueue.java

+48 −0

Original line number	Diff line number	Diff line
		@@ -760,6 +760,54 @@ public final class BroadcastQueue {
		}
		}

		// Check that the receiver does not have any excluded permissions
		if (!skip && r.excludedPermissions != null && r.excludedPermissions.length > 0) {
		for (int i = 0; i < r.excludedPermissions.length; i++) {
		String excludedPermission = r.excludedPermissions[i];
		final int perm = mService.checkComponentPermission(excludedPermission,
		filter.receiverList.pid, filter.receiverList.uid, -1, true);

		int appOp = AppOpsManager.permissionToOpCode(excludedPermission);
		if (appOp != AppOpsManager.OP_NONE) {
		// When there is an app op associated with the permission,
		// skip when both the permission and the app op are
		// granted.
		if ((perm == PackageManager.PERMISSION_GRANTED) && (
		mService.getAppOpsManager().checkOpNoThrow(appOp,
		filter.receiverList.uid,
		filter.packageName)
		== AppOpsManager.MODE_ALLOWED)) {
		Slog.w(TAG, "Appop Denial: receiving "
		+ r.intent.toString()
		+ " to " + filter.receiverList.app
		+ " (pid=" + filter.receiverList.pid
		+ ", uid=" + filter.receiverList.uid + ")"
		+ " excludes appop " + AppOpsManager.permissionToOp(
		excludedPermission)
		+ " due to sender " + r.callerPackage
		+ " (uid " + r.callingUid + ")");
		skip = true;
		break;
		}
		} else {
		// When there is no app op associated with the permission,
		// skip when permission is granted.
		if (perm == PackageManager.PERMISSION_GRANTED) {
		Slog.w(TAG, "Permission Denial: receiving "
		+ r.intent.toString()
		+ " to " + filter.receiverList.app
		+ " (pid=" + filter.receiverList.pid
		+ ", uid=" + filter.receiverList.uid + ")"
		+ " excludes " + excludedPermission
		+ " due to sender " + r.callerPackage
		+ " (uid " + r.callingUid + ")");
		skip = true;
		break;
		}
		}
		}
		}

		// Check that the receiver does not belong to any of the excluded packages
		if (!skip && r.excludedPackages != null && r.excludedPackages.length > 0) {
		if (ArrayUtils.contains(r.excludedPackages, filter.packageName)) {