Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 06a9e5b8: am b5b6f33e: am ea6f0c52: Fixing cross-user content.

Browse Source 
* commit '06a9e5b8fd3abccdc2c24ec53b2fcb484948402b':
  Fixing cross-user content.
This commit is contained in:
Nicolas Prevot
2014-07-23 13:26:14 +00:00
committed by Android Git Automerger
parent d611df99dc 2a9844c5cc
commit 3cf8714489
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/ActivityManagerService.java
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;
}