Fixing cross-user content.

Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e
This commit is contained in:
Nicolas Prevot
2014-07-21 16:28:21 +01:00
committed by Nicolas Prévot
parent bffb0635aa
commit 66adae84d7

View File

@@ -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;
}