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

Commit d91f4d23 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301b am: ef2ec0db... 

Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301b am: ef2ec0db am: 8579b272 am: 3d34c594

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

Change-Id: Ie38c92520c1a9ef8b7f575f3c075c7d68b8f6d09
parents bcf7990b 3d34c594

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

+8 −6
Original line number Diff line number Diff line
@@ -964,12 +964,14 @@ public class AppsFilter { 
            try {

                Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "requestsQueryAllPackages");

                if (callingPkgSetting != null) {

                    if (requestsQueryAllPackages(callingPkgSetting)) {

                        if (callingPkgSetting.pkg != null

                                && requestsQueryAllPackages(callingPkgSetting.pkg)) {

                            return false;

                        }

                } else {

                    for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) {

                        if (requestsQueryAllPackages(callingSharedPkgSettings.valueAt(i))) {

                        AndroidPackage pkg = callingSharedPkgSettings.valueAt(i).pkg;

                        if (pkg != null && requestsQueryAllPackages(pkg)) {

                            return false;

                        }

                    }
@@ -1058,10 +1060,10 @@ public class AppsFilter { 
    }





    private static boolean requestsQueryAllPackages(PackageSetting pkgSetting) {

    private static boolean requestsQueryAllPackages(@NonNull AndroidPackage pkg) {

        // we're not guaranteed to have permissions yet analyzed at package add, so we inspect the

        // package directly

        return pkgSetting.pkg.getRequestedPermissions().contains(

        return pkg.getRequestedPermissions().contains(

                Manifest.permission.QUERY_ALL_PACKAGES);

    }