Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df1fffe2 authored by Chris Tate's avatar Chris Tate Committed by Android Git Automerger
Browse files

am 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component... 

am 498cf7ac: am a0d4c975: am 1a31af15: am a3fd27ad: Merge "Check component permissions like \'exported\' before assigned permissions" into mnc-dev

* commit '498cf7ac':
  Check component permissions like 'exported' before assigned permissions
parents d87a21b5 498cf7ac

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;