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

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

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

Merge "Merge "Filter instant apps with different names" into oc-dev am: adcc94f1 am: ae524ac5" into oc-dr1-dev-plus-aosp
am: 193a4f12

Change-Id: I4f8fe31455f5946477d8a793843e70d0f88d17eb
parents 655de1bc 193a4f12

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

+4 −1
Original line number Diff line number Diff line
@@ -7209,12 +7209,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