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

Merge "Enforce package visibility filters to grantUriPermission()"

Browse Source
This commit is contained in:
Rhed Jao
2021-12-20 03:52:55 +00:00
committed by Android (Google) Code Review
parent d77c92a3f1 abc1ce5ba2
commit 4fd2da8af2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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);
}
}