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

This commit is contained in:
Dianne Hackborn
2011-01-22 11:26:05 -08:00
committed by Android Code Review

View File

@ -4385,12 +4385,15 @@ 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) {
perm.readOwners.add(owner);
owner.addReadPermission(perm);
} else if ((modeFlags&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {
perm.writeOwners.add(owner);
owner.addWritePermission(perm);
} else {
if ((modeFlags&Intent.FLAG_GRANT_READ_URI_PERMISSION) != 0) {
perm.readOwners.add(owner);
owner.addReadPermission(perm);
}
if ((modeFlags&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {
perm.writeOwners.add(owner);
owner.addWritePermission(perm);
}
}
}