commit | c289922beed948220bc876feb5929ab4f86096e9 | [log] [tgz] |
---|---|---|
author | Todd Kennedy <toddke@google.com> | Fri Apr 08 20:55:02 2016 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Apr 08 20:55:04 2016 +0000 |
tree | 0bbbcfb6010630936c991971b8b943a6abdb3fa1 | |
parent | 3212a4c759055ba3f81848f0285b4f5fe3f3ab25 [diff] | |
parent | 421d8f5fab1c4f1729d735935264d6fc3054a073 [diff] |
Merge "Fix NPE for MATCH_FACTORY_ONLY" into nyc-dev
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; } }