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

Commit 809abd45 authored by Felipe Leme's avatar Felipe Leme
Browse files

Minor fixes on URI permission methods. 

- clearGrantedUriPermissions() was clearing all permissions, including those
  where the app was the source of the permission.
- clearGrantedUriPermissions() was not thread safe.
- takePersistableUriPermission() was creating an extra object.

Bug: 63720392
Test: manual verification

Change-Id: I57a7b2c40b0e258f373f50badbb376daad3ca2d0
parent 1db96724

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

+13 −8
Original line number Diff line number Diff line
@@ -6434,7 +6434,8 @@ public class ActivityManagerService extends IActivityManager.Stub 
                    if (!keepState) {

                        synchronized (this) {

                            // Remove all permissions granted from/to this package

                            removeUriPermissionsForPackageLocked(packageName, resolvedUserId, true);

                            removeUriPermissionsForPackageLocked(packageName, resolvedUserId, true,

                                    false);

                        }















                        // Reset notification state










@@ -7089,7 +7090,7 @@ public class ActivityManagerService extends IActivityManager.Stub













        }





























        // Remove transient permissions granted from/to this package/user













        removeUriPermissionsForPackageLocked(packageName, userId, false);













        removeUriPermissionsForPackageLocked(packageName, userId, false, false);





























        if (doit) {















            for (i = mBroadcastQueues.length - 1; i >= 0; i--) {










@@ -9812,9 +9813,11 @@ public class ActivityManagerService extends IActivityManager.Stub













     * @param userHandle User to match, or {@link UserHandle#USER_ALL} to apply















     *            to all users.















     * @param persistable If persistable grants should be removed.













     * @param targetOnly When {@code true}, only remove permissions where the app is the target,













     * not source.















     */















    private void removeUriPermissionsForPackageLocked(













            String packageName, int userHandle, boolean persistable) {













            String packageName, int userHandle, boolean persistable, boolean targetOnly) {















        if (userHandle == UserHandle.USER_ALL && packageName == null) {















            throw new IllegalArgumentException("Must narrow by either package or user");















        }









@@ -9833,7 +9836,7 @@ public class ActivityManagerService extends IActivityManager.Stub













                    final UriPermission perm = it.next();





























                    // Only inspect grants matching package













                    if (packageName == null || perm.sourcePkg.equals(packageName)













                    if (packageName == null || (!targetOnly && perm.sourcePkg.equals(packageName))















                            || perm.targetPkg.equals(packageName)) {















                        // Hacky solution as part of fixing a security bug; ignore















                        // grants associated with DownloadManager so we don't have










@@ -10085,8 +10088,7 @@ public class ActivityManagerService extends IActivityManager.Stub













            boolean persistChanged = false;















            GrantUri grantUri = new GrantUri(userId, uri, false);



























            UriPermission exactPerm = findUriPermissionLocked(callingUid,













                    new GrantUri(userId, uri, false));













            UriPermission exactPerm = findUriPermissionLocked(callingUid, grantUri);















            UriPermission prefixPerm = findUriPermissionLocked(callingUid,















                    new GrantUri(userId, uri, true));
























@@ -10269,7 +10271,9 @@ public class ActivityManagerService extends IActivityManager.Stub













    public void clearGrantedUriPermissions(String packageName, int userId) {















        enforceCallingPermission(android.Manifest.permission.CLEAR_APP_GRANTED_URI_PERMISSIONS,















                "clearGrantedUriPermissions");













        removeUriPermissionsForPackageLocked(packageName, userId, true);













        synchronized(this) {













            removeUriPermissionsForPackageLocked(packageName, userId, true, true);













        }















    }





























    @Override










@@ -20858,7 +20862,8 @@ public class ActivityManagerService extends IActivityManager.Stub













                                                intent.getIntExtra(Intent.EXTRA_UID, -1), ssp);





























                                        // Remove all permissions granted from/to this package













                                        removeUriPermissionsForPackageLocked(ssp, userId, true);













                                        removeUriPermissionsForPackageLocked(ssp, userId, true,













                                                false);





























                                        mRecentTasks.removeTasksByPackageName(ssp, userId);