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

Commit 768da9de authored by Patrick Baumann's avatar Patrick Baumann Committed by Automerger Merge Worker
Browse files

Merge "Allow start of explicit intents" into rvc-dev am: 7a7590dc am:... 

Merge "Allow start of explicit intents" into rvc-dev am: 7a7590dc am: 0c67708c am: 8a3f17b5 am: f5be40e9

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

Change-Id: I41642556f178b5169cae98a3fbe294bf02182f29
parents 0f9d941b f5be40e9

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

+5 −4
Original line number Diff line number Diff line
@@ -7158,7 +7158,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                        && ((!matchInstantApp && !isCallerInstantApp && isTargetInstantApp)

                                || (matchVisibleToInstantAppOnly && isCallerInstantApp

                                        && isTargetHiddenFromInstantApp));

                final boolean blockNormalResolution = !isTargetInstantApp && !isCallerInstantApp

                final boolean blockNormalResolution =

                        !resolveForStart && !isTargetInstantApp && !isCallerInstantApp

                                && shouldFilterApplicationLocked(

                                getPackageSettingInternal(ai.applicationInfo.packageName,

                                        Process.SYSTEM_UID), filterCallingUid, userId);
@@ -7252,8 +7253,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                final PackageSetting setting =

                        getPackageSettingInternal(pkgName, Process.SYSTEM_UID);

                result = null;

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

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

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

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

                    result = filterIfNotSystemUser(mComponentResolver.queryActivities(

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

                            userId);