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

Commit 1f007d14 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev

parents 9690f889 021747a0

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

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














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















        // this uri?













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













        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 (!checkHoldingPermissionsLocked(pm, pi, grantUri, callingUid, modeFlags)) {















                // Require they hold a strong enough Uri permission















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