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

Commit a350db60 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Filter instant apps with different names" into oc-dev

am: adcc94f1

Change-Id: Ia4d1b58648ceb986b0af014cb6b3a6f6c0b2ce2f
parents a86cc709 adcc94f1
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -7205,12 +7205,15 @@ public class PackageManagerService extends IPackageManager.Stub
                    // load resources from the correct package
                    installerInfo.resolvePackageName = info.getComponentInfo().packageName;
                    resolveInfos.set(i, installerInfo);
                }
                    continue;
                }
            }
            // caller is a full app, don't need to apply any other filtering
            if (ephemeralPkgName == null) {
                continue;
            } else if (ephemeralPkgName.equals(info.activityInfo.packageName)) {
                // caller is same app; don't need to apply any other filtering
                continue;
            }
            // allow activities that have been explicitly exposed to ephemeral apps
            if (!isEphemeralApp