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

Commit 0d4c67ab authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge "Fixes component-based visibility recompute" into rvc-dev am: e505016e 

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

Change-Id: I96b504537eef946aa547a22cc63b8f54e0d1260c
parents 7e611931 e505016e

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -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)) {