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

am: ea99954804

Change-Id: If4d45586afd4dde05a3aad10d25f73afdcc3e92d

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

@@ -4231,6 +4231,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) {