From fb697521597aa55165355312ee5346a8b85f435e Mon Sep 17 00:00:00 2001
From: Varun Shah <varunshah@google.com>
Date: Thu, 18 May 2023 05:10:59 +0000
Subject: [PATCH] Fix NPE in UriPermissions.

Change-Id: Ibc6f1a445d9729700370619f7cd9cf440441d06d
Fixes: 268262400
Test: builds, flashes, device boots.
---
 services/core/java/com/android/server/uri/UriPermission.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/uri/UriPermission.java b/services/core/java/com/android/server/uri/UriPermission.java
index 6db781ac419a7..f3eeab0a4174a 100644
--- 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;
             }