summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 716394c808ec..6fccbdd0370e 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -26547,11 +26547,17 @@ public class PackageManagerService extends IPackageManager.Stub
}
}
+ // TODO(188814480) should be able to remove the NPE check when snapshot
+ // "recursion" is fixed.
@Override
public boolean isEnabledAndMatches(ParsedMainComponent component, int flags, int userId) {
synchronized (mLock) {
AndroidPackage pkg = getPackage(component.getPackageName());
- return mSettings.isEnabledAndMatchLPr(pkg, component, flags, userId);
+ if (pkg == null) {
+ return false;
+ } else {
+ return mSettings.isEnabledAndMatchLPr(pkg, component, flags, userId);
+ }
}
}