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

Commit 66adae84 authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Nicolas Prévot
Browse files

Fixing cross-user content. 

Change-Id: I1f1beb514950f808ed9113357c3172bddcb06d9e
parent bffb0635

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;

                }