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

Commit e28ce408 authored by Lee Shombert's avatar Lee Shombert Committed by Automerger Merge Worker
Browse files

Merge "Test for null package in isEnabledAndMatches()" into sc-dev am: 6c83011d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14668164

Change-Id: I1cf751780b9c770f3d623582ba0eb6918d3cf5aa
parents dc341cba 6c83011d

services/core/java/com/android/server/pm/PackageManagerService.java

+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) {