Handle case for missing permissions - fix NPE am: 39cc33f192

am: 6e527d0ec5 Change-Id: Ic15a4d3e5c71cf73957c10789e1cfb8c9353ea78
2017-07-28 21:30:58 +00:00
parent a514e9e4b2 6e527d0ec5
commit 88414961ab
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;
        }
    }