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

Commit 4fd2da8a authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Enforce package visibility filters to grantUriPermission()"

parents d77c92a3 abc1ce5b

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

+5 −1
Original line number Diff line number Diff line
@@ -5915,6 +5915,10 @@ public class ActivityManagerService extends IActivityManager.Stub 
            if (targetPkg == null) {

                throw new IllegalArgumentException("null target");

            }

            final int callingUserId = UserHandle.getUserId(r.uid);

            if (mPackageManagerInt.filterAppAccess(targetPkg, r.uid, callingUserId)) {

                return;

            }















            Preconditions.checkFlagsArgument(modeFlags, Intent.FLAG_GRANT_READ_URI_PERMISSION















                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION









@@ -5926,7 +5930,7 @@ public class ActivityManagerService extends IActivityManager.Stub













            intent.setFlags(modeFlags);





























            final NeededUriGrants needed = mUgmInternal.checkGrantUriPermissionFromIntent(intent,













                    r.uid, targetPkg, UserHandle.getUserId(r.uid));













                    r.uid, targetPkg, callingUserId);















            mUgmInternal.grantUriPermissionUncheckedFromIntent(needed, null);















        }















    }