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

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

Merge "Fixes query logic when not instant" into rvc-dev am: f1146130 

Change-Id: If0cc62f5c2f2993385f2b4c862369d95e1155eab
parents fb6396d1 f1146130

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

+4 −6
Original line number Diff line number Diff line
@@ -7238,8 +7238,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                resolveInfos.set(i, installerInfo);

                continue;

            }

            // caller is a full app

            if (ephemeralPkgName == null) {

                // caller is a full app

                SettingBase callingSetting =

                        mSettings.getSettingLPr(UserHandle.getAppId(filterCallingUid));

                PackageSetting resolvedSetting =
@@ -7259,11 +7259,9 @@ public class PackageManagerService extends IPackageManager.Stub 
                    && intent.getComponent() == null) {

                // ephemeral apps can launch other ephemeral apps indirectly

                continue;

            }

            } else if (((info.activityInfo.flags & ActivityInfo.FLAG_VISIBLE_TO_INSTANT_APP) != 0)

                    && !info.activityInfo.applicationInfo.isInstantApp()) {

                // allow activities that have been explicitly exposed to ephemeral apps

            final boolean isEphemeralApp = info.activityInfo.applicationInfo.isInstantApp();

            if (!isEphemeralApp

                    && ((info.activityInfo.flags & ActivityInfo.FLAG_VISIBLE_TO_INSTANT_APP) != 0)) {

                continue;

            }

            resolveInfos.remove(i);