commit 89becc539f7e1184bc0260ebe51e880ae807b384
author android-build-team Robot <android-build-team-robot@google.com> Sat Jul 29 16:20:43 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jul 29 16:20:43 2017 +0000
tree adb31c1db205db9233f38141b3847ea09236cd7e
parent 757a03843c7ef83296e525377cd6943330a96c25
parent f7e966c32685b040c55b3b21510a1fa463b2eff9

Merge cherrypicks of [2627701] into oc-release

Change-Id: I13dba40107ad2acef7dbe717fcd01f39dbc9ad49

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 ddb5832..f36b762 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4004,6 +4004,9 @@
         // reader
         synchronized (mPackages) {
             final BasePermission p = mSettings.mPermissions.get(name);
+            if (p == null) {
+                return null;
+            }
             // If the caller is an app that targets pre 26 SDK drop protection flags.
             final PermissionInfo permissionInfo = generatePermissionInfo(p, flags);
             if (permissionInfo != null) {