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

Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690cf5

Browse Source 
am: c510e19d18

Change-Id: I532b675a10ae9e21f28f3aa38d0f2e85ac080faa
This commit is contained in:
Amith Yamasani
2017-02-14 01:02:54 +00:00
committed by android-build-merger
parent a26e371c9b c510e19d18
commit 67dbaa8a14
1 changed files with 1 additions and 6 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

@@ -8204,12 +8204,7 @@ 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?
final int callingAppId = UserHandle.getAppId(callingUid); if (UserHandle.getAppId(callingUid) != Process.SYSTEM_UID) {
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)) {