drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dianne Hackborn
2011-01-22 11:26:05 -08:00
committed by Android Code Review
parent a8069f34f6 91c12c27ef
commit 35f4d32dc2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/am/ActivityManagerService.java
View File

@ -4385,14 +4385,17 @@ public final class ActivityManagerService extends ActivityManagerNative
perm.modeFlags |= modeFlags; perm.modeFlags |= modeFlags;
if (owner == null) { if (owner == null) {
perm.globalModeFlags |= modeFlags; 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); perm.readOwners.add(owner);
owner.addReadPermission(perm); 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); perm.writeOwners.add(owner);
owner.addWritePermission(perm); owner.addWritePermission(perm);
} }
} }
}
void grantUriPermissionLocked(int callingUid, void grantUriPermissionLocked(int callingUid,
String targetPkg, Uri uri, int modeFlags, UriPermissionOwner owner) { String targetPkg, Uri uri, int modeFlags, UriPermissionOwner owner) {