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 am: 6c83011d9c am: e28ce40823

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

Change-Id: I6a589a2bd201c915b602f14053d0640ce031df7a
This commit is contained in:
Lee Shombert
2021-05-21 17:17:27 +00:00
committed by Automerger Merge Worker
parent c75c998ba0 e28ce40823
commit 6c84bf3298
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
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);
}
}
}