commit 421d8f5fab1c4f1729d735935264d6fc3054a073
author Todd Kennedy <toddke@google.com> Fri Apr 08 13:45:49 2016 -0700
committer Todd Kennedy <toddke@google.com> Fri Apr 08 13:45:49 2016 -0700
tree 2f2f15d186b82205b182a2a7e98f122c667664b2
parent 347bb9a3cf53595b8beed17574cec9c0072aa819

Fix NPE for MATCH_FACTORY_ONLY

Bug: 28087606
Change-Id: Ib86c5189aa9a9ca87504625dd19bdeab56fd4967

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 fbf4c0c..cc4f31a 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3036,7 +3036,7 @@
             }
             if (p == null) {
                 p = mPackages.get(packageName);
-                if (matchFactoryOnly && !isSystemApp(p)) {
+                if (matchFactoryOnly && p != null && !isSystemApp(p)) {
                     return null;
                 }
             }