commit 0ff02be69d9fe57df60eb12af25dd0c56e76b2f4
author Todd Kennedy <toddke@google.com> Mon Jun 26 10:34:41 2017 -0700
committer android-build-team Robot <android-build-team-robot@google.com> Tue Jun 27 05:58:41 2017 +0000
tree 2819c9b9a643a6905d4fcab07bc34f4f5d2066e6
parent 0f307172a98500afe87dbd023d5abea111927351

Filter instant apps with different names

ag/2447596 introduced a regression that caused instant apps to be
made visible to one another.

Change-Id: I5db9a43f05dd5bec991cc0934b1c9a9406dfade6
Fixes: 62998487
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
(cherry picked from commit 1dfb21b673471aa8780e2b44b362a70f4675cb49)

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

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 141ce2d..9e4ba8b 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -7207,12 +7207,15 @@
                     // load resources from the correct package
                     installerInfo.resolvePackageName = info.getComponentInfo().packageName;
                     resolveInfos.set(i, installerInfo);
+                    continue;
                 }
-                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