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

Merge "Fixes component-based visibility recompute" into rvc-dev

Browse Source
This commit is contained in:
Patrick Baumann
2020-07-08 20:42:22 +00:00
committed by Android (Google) Code Review
parent aefe277271 76aa2deba7
commit e505016e9b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -708,12 +708,15 @@ public class AppsFilter {
return ret; return ret;
} }
/**
* This method recomputes all component / intent-based visibility and is intended to match the
* relevant logic of {@link #addPackageInternal(PackageSetting, ArrayMap)}
*/
private void recomputeComponentVisibility(ArrayMap<String, PackageSetting> existingSettings) { private void recomputeComponentVisibility(ArrayMap<String, PackageSetting> existingSettings) {
mQueriesViaComponent.clear(); mQueriesViaComponent.clear();
for (int i = existingSettings.size() - 1; i >= 0; i--) { for (int i = existingSettings.size() - 1; i >= 0; i--) {
PackageSetting setting = existingSettings.valueAt(i); PackageSetting setting = existingSettings.valueAt(i);
if (setting.pkg == null if (setting.pkg == null || requestsQueryAllPackages(setting.pkg)) {
|| mForceQueryable.contains(setting.appId)) {
continue; continue;
} }
for (int j = existingSettings.size() - 1; j >= 0; j--) { for (int j = existingSettings.size() - 1; j >= 0; j--) {
@@ -721,7 +724,7 @@ public class AppsFilter {
continue; continue;
} }
final PackageSetting otherSetting = existingSettings.valueAt(j); final PackageSetting otherSetting = existingSettings.valueAt(j);
if (otherSetting.pkg == null) { if (otherSetting.pkg == null || mForceQueryable.contains(otherSetting.appId)) {
continue; continue;
} }
if (canQueryViaComponents(setting.pkg, otherSetting.pkg, mProtectedBroadcasts)) { if (canQueryViaComponents(setting.pkg, otherSetting.pkg, mProtectedBroadcasts)) {