Fix NPE in UriPermissions.

Change-Id: Ibc6f1a445d9729700370619f7cd9cf440441d06d Fixes: 268262400 Test: builds, flashes, device boots.
2023-05-18 05:10:59 +00:00
parent 3ede2ac6c1
commit fb69752159
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;
            }