Handle case for missing permissions - fix NPE

am: 39cc33f192 Change-Id: I8fd46e293a25ddf83346950e8e700ec9d61e2263
2017-07-28 21:22:57 +00:00
parent 51f65bbcbf 39cc33f192
commit 6e527d0ec5
1 changed files with 4 additions and 2 deletions
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4007,8 +4007,10 @@ public class PackageManagerService extends IPackageManager.Stub
            final BasePermission p = mSettings.mPermissions.get(name);
            // If the caller is an app that targets pre 26 SDK drop protection flags.
            final PermissionInfo permissionInfo = generatePermissionInfo(p, flags);
-            permissionInfo.protectionLevel = adjustPermissionProtectionFlagsLPr(
-                    permissionInfo.protectionLevel, packageName, callingUid);
+            if (permissionInfo != null) {
+                permissionInfo.protectionLevel = adjustPermissionProtectionFlagsLPr(
+                        permissionInfo.protectionLevel, packageName, callingUid);
+            }
            return permissionInfo;
        }
    }