From 55100571da7f6d142c39d6baed85cbd4c153e5ad Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Mon, 13 Feb 2017 21:59:14 +0000 Subject: DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system." Reason: Breaking setting the user avatar in Settings. Bug: 35158271 This reverts commit b61338ecb307a2f595a8f78e290b5287a6503aaa. Change-Id: Ia08c12be3da06b0d02e71635b46350c8ff50ec19 --- .../core/java/com/android/server/am/ActivityManagerService.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 1fe3ee2d8e12..bc9d58eec3b1 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8150,12 +8150,7 @@ public final class ActivityManagerService extends ActivityManagerNative // Third... does the caller itself have permission to access // this uri? - 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 (UserHandle.getAppId(callingUid) != Process.SYSTEM_UID) { if (!checkHoldingPermissionsLocked(pm, pi, grantUri, callingUid, modeFlags)) { // Require they hold a strong enough Uri permission if (!checkUriPermissionLocked(grantUri, callingUid, modeFlags)) { -- cgit v1.2.3-59-g8ed1b