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

Commit 5ae2bd6c 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 am: 950e8d69 

Change-Id: If08cfa036b7cfdaf6f922e391bc21429fd4b03c7
parents 5d391ed1 950e8d69

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