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

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

am 3bb61710: am 4df5251c: am a309e38c: Merge "Preventing apps from granting... 

am 3bb61710: am 4df5251c: am a309e38c: Merge "Preventing apps from granting uris to any other user." into lmp-dev

* commit '3bb6171074f4a570a77727f6a8f0ae22b1626792':
  Preventing apps from granting uris to any other user.
parents 6f5c97e8 c52c0346

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

+35 −0
Original line number Diff line number Diff line
@@ -6615,6 +6615,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
        return false;

    }













    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param userId The userId in which the uri is to be resolved.













     */















    @Override















    public int checkUriPermission(Uri uri, int pid, int uid,















            final int modeFlags, int userId) {










@@ -6767,6 +6771,10 @@ public final class ActivityManagerService extends ActivityManagerNative













        return targetUid;















    }



























    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param userId The userId in which the uri is to be resolved.













     */















    @Override















    public int checkGrantUriPermission(int callingUid, String targetPkg, Uri uri,















            final int modeFlags, int userId) {










@@ -6951,6 +6959,10 @@ public final class ActivityManagerService extends ActivityManagerNative













        grantUriPermissionUncheckedFromIntentLocked(needed, owner);















    }



























    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param userId The userId in which the uri is to be resolved.













     */















    @Override















    public void grantUriPermission(IApplicationThread caller, String targetPkg, Uri uri,















            final int modeFlags, int userId) {










@@ -7053,6 +7065,10 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param userId The userId in which the uri is to be resolved.













     */















    @Override















    public void revokeUriPermission(IApplicationThread caller, Uri uri, final int modeFlags,















            int userId) {










@@ -7151,9 +7167,16 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param sourceUserId The userId in which the uri is to be resolved.













     * @param targetUserId The userId of the app that receives the grant.













     */















    @Override















    public void grantUriPermissionFromOwner(IBinder token, int fromUid, String targetPkg, Uri uri,















            final int modeFlags, int sourceUserId, int targetUserId) {













        targetUserId = handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),













                targetUserId, false, ALLOW_FULL_ONLY, "grantUriPermissionFromOwner", null);















        synchronized(this) {















            UriPermissionOwner owner = UriPermissionOwner.fromExternalToken(token);















            if (owner == null) {









@@ -7178,6 +7201,10 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param userId The userId in which the uri is to be resolved.













     */















    @Override















    public void revokeUriPermissionFromOwner(IBinder token, Uri uri, int mode, int userId) {















        synchronized(this) {










@@ -7318,6 +7345,10 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param userId The userId in which the uri is to be resolved.













     */















    @Override















    public void takePersistableUriPermission(Uri uri, final int modeFlags, int userId) {















        enforceNotIsolatedCaller("takePersistableUriPermission");










@@ -7360,6 +7391,10 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    /**













     * @param uri This uri must NOT contain an embedded userId.













     * @param userId The userId in which the uri is to be resolved.













     */















    @Override















    public void releasePersistableUriPermission(Uri uri, final int modeFlags, int userId) {















        enforceNotIsolatedCaller("releasePersistableUriPermission");