Merge "Test for null package in isEnabledAndMatches()" into sc-dev

2021-05-21 16:39:24 +00:00
parent e4cc52acce ff9a01834e
commit 6c83011d9c
1 changed files with 7 additions and 1 deletions
--- 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);
+                }
            }
        }