commit 44303087cc4d8a0830b14a87c2b7f32a39e9080b
author Mark Renouf <mrenouf@google.com> Fri Apr 08 20:58:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 08 20:58:48 2016 +0000
tree 92081c620216150b54b8e38f6ed38e139f1a31f2
parent c289922beed948220bc876feb5929ab4f86096e9
parent 880602eb640f1f0f7f77f8d17c4ad34aca8b751d

Merge "Customizes input extract edit view for Wear" into nyc-dev

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