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

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

Merge "Filter activity starts that target package name" into rvc-dev am: c5533a9e 

Change-Id: I34c73de8b2036588c0399b2b72bc088c7bebb967
parents b86eedf7 c5533a9e

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

+6 −3
Original line number Diff line number Diff line
@@ -7210,11 +7210,14 @@ public class PackageManagerService extends IPackageManager.Stub 
                    sortResult = true;

                }

            } else {

                final AndroidPackage pkg = mPackages.get(pkgName);

                final PackageSetting setting =

                        getPackageSettingInternal(pkgName, Process.SYSTEM_UID);

                result = null;

                if (pkg != null) {

                if (setting != null && setting.pkg != null

                        && !shouldFilterApplicationLocked(setting, filterCallingUid, userId)) {

                    result = filterIfNotSystemUser(mComponentResolver.queryActivities(

                            intent, resolvedType, flags, pkg.getActivities(), userId), userId);

                            intent, resolvedType, flags, setting.pkg.getActivities(), userId),

                            userId);

                }

                if (result == null || result.size() == 0) {

                    // the caller wants to resolve for a particular package; however, there