commit c9935cbce48c19b403eb479590dd9a1a2e01aaab
author Svet Ganov <svetoslavganov@google.com> Fri Jul 28 13:10:33 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jul 28 21:20:32 2017 +0000
tree 1192a3fb7c48907d4dc33db33bc74a976b1a6954
parent 7fb2578e9dc43d7b7c052f0be838025edcfa5ec2

Handle case for missing permissions - fix NPE

Test: manual

Bug:62755026

Change-Id: Ie4dddffdb055f6084d9420ae94d0de2a61574bd8
(cherry picked from commit 39cc33f192d528f250818446ea0418aaf0cfe41f)

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 c1b98f5..ddb5832 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 @@
             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;
         }
     }