From 66adae84d7e1475c4422d80860eed17e234ab8a9 Mon Sep 17 00:00:00 2001 From: Nicolas Prevot Date: Mon, 21 Jul 2014 16:28:21 +0100 Subject: [PATCH] Fixing cross-user content. Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e --- services/core/java/com/android/server/am/ActivityManagerService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 2d6d09b70e22..dcb4f1817da5 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -8060,8 +8060,8 @@ public final class ActivityManagerService extends ActivityManagerNative boolean checkedGrants = false; if (checkUser) { // Looking for cross-user grants before enforcing the typical cross-users permissions - int tmpTargetUserId = unsafeConvertIncomingUser(UserHandle.getUserId(callingUid)); - if (tmpTargetUserId != userId) { + int tmpTargetUserId = unsafeConvertIncomingUser(userId); + if (tmpTargetUserId != UserHandle.getUserId(callingUid)) { if (checkAuthorityGrants(callingUid, cpi, tmpTargetUserId, checkUser)) { return null; } -- 2.11.0