Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c83011d authored by Lee Shombert's avatar Lee Shombert Committed by Android (Google) Code Review
Browse files

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

parents e4cc52ac ff9a0183
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -26547,13 +26547,19 @@ 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());
                if (pkg == null) {
                    return false;
                } else {
                    return mSettings.isEnabledAndMatchLPr(pkg, component, flags, userId);
                }
            }
        }
        @Override
        public boolean userNeedsBadging(int userId) {