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

Commit 669d6694 authored by Amith Yamasani's avatar Amith Yamasani Committed by android-build-merger
Browse files

Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from... 

Merge "DO NOT MERGE : Revert "DO NOT MERGE. No direct Uri grants from system."" into nyc-mr1-dev am: 7556690c am: c510e19d
am: 67dbaa8a

Change-Id: Ie554aec3a777468b8dc7da731337ffbdb2851846
parents a0dff345 67dbaa8a

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

+1 −6
Original line number Diff line number Diff line
@@ -8212,12 +8212,7 @@ public final class ActivityManagerService extends ActivityManagerNative 














        // Third...  does the caller itself have permission to access















        // this uri?













        final int callingAppId = UserHandle.getAppId(callingUid);













        if ((callingAppId == Process.SYSTEM_UID) || (callingAppId == Process.ROOT_UID)) {













            Slog.w(TAG, "For security reasons, the system cannot issue a Uri permission"













                    + " grant to " + grantUri + "; use startActivityAsCaller() instead");













            return -1;













        } else {













        if (UserHandle.getAppId(callingUid) != Process.SYSTEM_UID) {















            if (!checkHoldingPermissionsLocked(pm, pi, grantUri, callingUid, modeFlags)) {















                // Require they hold a strong enough Uri permission















                if (!checkUriPermissionLocked(grantUri, callingUid, modeFlags)) {