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

Commit 193a4f12 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents 29532b40 191df632
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