Merge "DO NOT MERGE: Cherry-pick 2ed524966d to JB." into jb-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
409d563b51
@@ -59,11 +59,11 @@ class UriPermission {
|
|||||||
if ((modeFlagsToClear&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {
|
if ((modeFlagsToClear&Intent.FLAG_GRANT_WRITE_URI_PERMISSION) != 0) {
|
||||||
globalModeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
|
globalModeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
|
||||||
modeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
|
modeFlags &= ~Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
|
||||||
if (readOwners.size() > 0) {
|
if (writeOwners.size() > 0) {
|
||||||
for (UriPermissionOwner r : writeOwners) {
|
for (UriPermissionOwner r : writeOwners) {
|
||||||
r.removeWritePermission(this);
|
r.removeWritePermission(this);
|
||||||
}
|
}
|
||||||
readOwners.clear();
|
writeOwners.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user