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

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-02-02 23:59:37 +00:00
committed by Android (Google) Code Review
parent 32c6684a67 3e2652a55d
commit 0354b89d31
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8113,7 +8113,12 @@ public final class ActivityManagerService extends ActivityManagerNative
// Third... does the caller itself have permission to access // Third... does the caller itself have permission to access
// this uri? // this uri?
if (UserHandle.getAppId(callingUid) != Process.SYSTEM_UID) { final int callingAppId = UserHandle.getAppId(callingUid);
if ((callingAppId == Process.SYSTEM_UID) || (callingAppId == Process.ROOT_UID)) {
Slog.w(TAG, "For security reasons, the system cannot issue a Uri permission"
+ " grant to " + grantUri + "; use startActivityAsCaller() instead");
return -1;
} else {
if (!checkHoldingPermissionsLocked(pm, pi, grantUri, callingUid, modeFlags)) { if (!checkHoldingPermissionsLocked(pm, pi, grantUri, callingUid, modeFlags)) {
// Require they hold a strong enough Uri permission // Require they hold a strong enough Uri permission
if (!checkUriPermissionLocked(grantUri, callingUid, modeFlags)) { if (!checkUriPermissionLocked(grantUri, callingUid, modeFlags)) {