Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in UriPermissions." into udc-dev am: d86a3857ba

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23309127

Change-Id: I5eab7ca006fdc1f4a78bcd61c65721211f7ed850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-18 18:39:11 +00:00
committed by Automerger Merge Worker
parent 4ff4a0a637 d86a3857ba
commit 6b79d2a99c
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/uri/UriPermission.java
View File

@@ -207,7 +207,9 @@ final class UriPermission {
if (mReadOwners != null && includingOwners) {
ownedModeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION;
for (UriPermissionOwner r : mReadOwners) {
r.removeReadPermission(this);
if (r != null) {
r.removeReadPermission(this);
}
}
mReadOwners = null;
}