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

Commit ad08c2ca authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Add a missing null check" into oc-dev am: 101fca65 

am: d56b01e0

Change-Id: I48191b693fac40513b670c711afea568eafe1ebf
parents 94eb33a3 d56b01e0

services/core/java/com/android/server/pm/PackageManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -4005,6 +4005,9 @@ public class PackageManagerService extends IPackageManager.Stub 
        // reader

        synchronized (mPackages) {

            final BasePermission p = mSettings.mPermissions.get(name);

            if (p == null) {

                return null;

            }

            // If the caller is an app that targets pre 26 SDK drop protection flags.

            final PermissionInfo permissionInfo = generatePermissionInfo(p, flags);

            if (permissionInfo != null) {