From dae86855cc938d6cf51d801b9f036accb3ce530f Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Mon, 13 Feb 2017 23:43:31 +0000 Subject: [PATCH] Revert "No direct Uri grants from system." Reason for revert: b/35158271 Bug: 35158271 This reverts commit 2dfe92c2dfbaddd69dabe6e43ab77c4c204c4065. Change-Id: Id04eab8100bfb0b3e137095b25b7d4b12c6d11e6 --- .../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 8bd75067bb94..f892e52960f2 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8103,12 +8103,7 @@ public class ActivityManagerService extends IActivityManager.Stub // 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)) { -- 2.11.0