From 39cc33f192d528f250818446ea0418aaf0cfe41f Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Fri, 28 Jul 2017 13:10:33 -0700
Subject: [PATCH] Handle case for missing permissions - fix NPE

Test: manual

Bug:62755026

Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8
---
 .../java/com/android/server/pm/PackageManagerService.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index c1b98f59566d3..ddb5832900386 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4006,8 +4006,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;
         }
     }