Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71983fa1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE in UriPermissions." into udc-dev am: d86a3857 am: 6b79d2a9 

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



Change-Id: I068bcd50fa9af5f842639881419003f601c35a7a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87fc4693 6b79d2a9

services/core/java/com/android/server/uri/UriPermission.java

+3 −1
Original line number Diff line number Diff line
@@ -207,8 +207,10 @@ final class UriPermission { 
            if (mReadOwners != null && includingOwners) {

                ownedModeFlags &= ~Intent.FLAG_GRANT_READ_URI_PERMISSION;

                for (UriPermissionOwner r : mReadOwners) {

                    if (r != null) {

                        r.removeReadPermission(this);

                    }

                }

                mReadOwners = null;

            }

        }