Merge "Fix NPE in UriPermissions." into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d86a3857ba
@@ -207,8 +207,10 @@ final class UriPermission {
|
|||||||
if (mReadOwners != null && includingOwners) {
|
if (mReadOwners != null && includingOwners) {
|
||||||
ownedModeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION;
|
ownedModeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION;
|
||||||
for (UriPermissionOwner r : mReadOwners) {
|
for (UriPermissionOwner r : mReadOwners) {
|
||||||
|
if (r != null) {
|
||||||
r.removeReadPermission(this);
|
r.removeReadPermission(this);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
mReadOwners = null;
|
mReadOwners = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user