Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -6030,6 +6030,9 @@ public final class ActivityManagerService extends ActivityManagerNative
             IPackageManager pm, ProviderInfo pi, GrantUri grantUri, int uid, final int modeFlags) {
         if (DEBUG_URI_PERMISSION) Slog.v(TAG,
                 "checkHoldingPermissionsLocked: uri=" + grantUri + " uid=" + uid);
+        if (UserHandle.getUserId(uid) != grantUri.sourceUserId) {
+            return false;
+        }
 
         if (pi.applicationInfo.uid == uid) {
             return true;