Merge "specialCrossUserGrant should not be false by default for secondary users."

2019-01-23 19:38:17 +00:00
parent d2bea320bc faa877f797
commit 9d67bb2c2d
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/uri/UriGrantsManagerService.java
+++ b/services/core/java/com/android/server/uri/UriGrantsManagerService.java
@@ -1129,7 +1129,8 @@ public class UriGrantsManagerService extends IUriGrantsManager.Stub {
         * In this case, we grant a uri permission, even if the ContentProvider does not normally
         * grant uri permissions.
         */
-        boolean specialCrossUserGrant = UserHandle.getUserId(targetUid) != grantUri.sourceUserId
+        boolean specialCrossUserGrant = targetUid >= 0
+                && UserHandle.getUserId(targetUid) != grantUri.sourceUserId
                && checkHoldingPermissionsInternal(pm, pi, grantUri, callingUid,
                modeFlags, false /*without considering the uid permissions*/);