Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cf87144 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android Git Automerger
Browse files

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

* commit '06a9e5b8fd3abccdc2c24ec53b2fcb484948402b':
  Fixing cross-user content.
parents d611df99 2a9844c5

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

                }