commit ad08c2ca4e3b0c7fa84b687e1aac9bd1c7e106f4
author Jeff Sharkey <jsharkey@google.com> Sat Jul 29 16:14:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jul 29 16:14:03 2017 +0000
tree 84f1480cc222b15b4ec9208e0bad863187bb5d12
parent 94eb33a365c14f7adfc493455c91adaa093b5b35
parent d56b01e022d88bc62a97dd8e3420b65feb266089

Merge "Add a missing null check" into oc-dev am: 101fca656d
am: d56b01e022

Change-Id: I48191b693fac40513b670c711afea568eafe1ebf

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 3ea9908..1eabac1 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4005,6 +4005,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) {