Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check component permissions like 'exported' before assigned permissions" into mnc-dev

Browse Source
This commit is contained in:
Chris Tate
2015-08-17 18:01:15 +00:00
committed by Android (Google) Code Review
parent a03567bfe0 ff7add011a
commit a3fd27adcc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -1687,16 +1687,16 @@ public final class ActivityStackSupervisor implements DisplayListener {
private int getComponentRestrictionForCallingPackage(ActivityInfo activityInfo, private int getComponentRestrictionForCallingPackage(ActivityInfo activityInfo,
String callingPackage, int callingPid, int callingUid, boolean ignoreTargetSecurity) { String callingPackage, int callingPid, int callingUid, boolean ignoreTargetSecurity) {
if (activityInfo.permission == null) {
return ACTIVITY_RESTRICTION_NONE;
}
if (!ignoreTargetSecurity && mService.checkComponentPermission(activityInfo.permission, if (!ignoreTargetSecurity && mService.checkComponentPermission(activityInfo.permission,
callingPid, callingUid, activityInfo.applicationInfo.uid, activityInfo.exported) callingPid, callingUid, activityInfo.applicationInfo.uid, activityInfo.exported)
== PackageManager.PERMISSION_DENIED) { == PackageManager.PERMISSION_DENIED) {
return ACTIVITY_RESTRICTION_PERMISSION; return ACTIVITY_RESTRICTION_PERMISSION;
} }
if (activityInfo.permission == null) {
return ACTIVITY_RESTRICTION_NONE;
}
final int opCode = AppOpsManager.permissionToOpCode(activityInfo.permission); final int opCode = AppOpsManager.permissionToOpCode(activityInfo.permission);
if (opCode == AppOpsManager.OP_NONE) { if (opCode == AppOpsManager.OP_NONE) {
return ACTIVITY_RESTRICTION_NONE; return ACTIVITY_RESTRICTION_NONE;