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

Commit 6d92cde2 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 35f4d32d: Merge "frameworks/base: Track owner in appropriate owners list of Uri" 

* commit '35f4d32d':
  frameworks/base: Track owner in appropriate owners list of Uri
parents f6439749 35f4d32d

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

+9 −6
Original line number Diff line number Diff line
@@ -4385,14 +4385,17 @@ public final class ActivityManagerService extends ActivityManagerNative 
        perm.modeFlags |= modeFlags;

        if (owner == null) {

            perm.globalModeFlags |= modeFlags;

        } else if ((modeFlags&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) {

        } else {

            if ((modeFlags&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) {

                 perm.readOwners.add(owner);

                 owner.addReadPermission(perm);

        } else if ((modeFlags&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {

            }

            if ((modeFlags&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {

                 perm.writeOwners.add(owner);

                 owner.addWritePermission(perm);

            }

        }

    }



    void grantUriPermissionLocked(int callingUid,

            String targetPkg, Uri uri, int modeFlags, UriPermissionOwner owner) {