Merge "Fix NPE in UriPermissions." into udc-dev

2023-05-18 17:57:10 +00:00
parent d7569a8097 fb69752159
commit d86a3857ba
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/uri/UriPermission.java
+++ b/services/core/java/com/android/server/uri/UriPermission.java
@@ -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;
            }