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

Merge "Fixes NPE on null pkg" into rvc-dev am: 7b3b0611d3

Browse Source 
Change-Id: I9f8079d0ad2ebc5dcd19f601c6aeeb2b60f2e282
This commit is contained in:
TreeHugger Robot
2020-05-26 16:07:23 +00:00
committed by Automerger Merge Worker
parent 41a950e82c 7b3b0611d3
commit 05a3919da8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -446,11 +446,6 @@ public class AppsFilter {
} }
} }
if (!newPkgSetting.pkg.getProtectedBroadcasts().isEmpty()) {
mProtectedBroadcasts.addAll(newPkgSetting.pkg.getProtectedBroadcasts());
recomputeComponentVisibility(existingSettings, newPkgSetting.pkg.getPackageName());
}
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "filter.addPackage");
try { try {
final AndroidPackage newPkg = newPkgSetting.pkg; final AndroidPackage newPkg = newPkgSetting.pkg;
@@ -459,6 +454,11 @@ public class AppsFilter {
return; return;
} }
if (!newPkg.getProtectedBroadcasts().isEmpty()) {
mProtectedBroadcasts.addAll(newPkg.getProtectedBroadcasts());
recomputeComponentVisibility(existingSettings, newPkg.getPackageName());
}
final boolean newIsForceQueryable = final boolean newIsForceQueryable =
mForceQueryable.contains(newPkgSetting.appId) mForceQueryable.contains(newPkgSetting.appId)
/* shared user that is already force queryable */ /* shared user that is already force queryable */