Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lee Shombert
2021-05-21 16:39:24 +00:00
committed by Android (Google) Code Review
parent e4cc52acce ff9a01834e
commit 6c83011d9c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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 @Override
public boolean isEnabledAndMatches(ParsedMainComponent component, int flags, int userId) { public boolean isEnabledAndMatches(ParsedMainComponent component, int flags, int userId) {
synchronized (mLock) { synchronized (mLock) {
AndroidPackage pkg = getPackage(component.getPackageName()); 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);
}
} }
} }