commit bc68d8229c700efe06b8a96b4ccaeafc9dc37c70
author Svet Ganov <svetoslavganov@google.com> Fri Jul 28 22:26:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 28 22:26:41 2017 +0000
tree e880543996f336d3a20389350e40523baa49feab
parent 465a92e3de7d6aa6a7cb3da35860146c105153ff
parent a2ab662f9b203d349cb912d0a49657e63fe9e98d

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

Change-Id: Ib882462b4b23fdf6247e4de1b4e4eefe4e450dcf

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 815d871..06359b0 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4233,8 +4233,10 @@
             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;
         }
     }