Merge "Check component permissions like 'exported' before assigned permissions" into mnc-dev (a3fd27ad) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -1687,16 +1687,16 @@ public final class ActivityStackSupervisor implements DisplayListener {

		private int getComponentRestrictionForCallingPackage(ActivityInfo activityInfo,
		String callingPackage, int callingPid, int callingUid, boolean ignoreTargetSecurity) {
		if (activityInfo.permission == null) {
		return ACTIVITY_RESTRICTION_NONE;
		}

		if (!ignoreTargetSecurity && mService.checkComponentPermission(activityInfo.permission,
		callingPid, callingUid, activityInfo.applicationInfo.uid, activityInfo.exported)
		== PackageManager.PERMISSION_DENIED) {
		return ACTIVITY_RESTRICTION_PERMISSION;
		}

		if (activityInfo.permission == null) {
		return ACTIVITY_RESTRICTION_NONE;
		}

		final int opCode = AppOpsManager.permissionToOpCode(activityInfo.permission);
		if (opCode == AppOpsManager.OP_NONE) {
		return ACTIVITY_RESTRICTION_NONE;