commit 34c32a244fddac70ed10c655adc1c2ae022b84d5
author Michael Groover <mpgroover@google.com> Thu Dec 22 00:52:05 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 22 00:52:05 2022 +0000
tree 5c4a275e4f6790cc223709d9c91b894ee07a874e
parent 53f7735e0823b18fba7c165f31a97304ab8c06a3
parent d8e0b093e49c96ca4889024b0d4fe3d7c7c1c847

Merge "Grant app visibility if launching app opts in to sharing identity"

services/core/java/com/android/server/wm/ActivityStarter.java

diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index eb3fdca..ff50fd4 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -1663,6 +1663,12 @@
             pmInternal.grantImplicitAccess(mStartActivity.mUserId, mIntent,
                     UserHandle.getAppId(mStartActivity.info.applicationInfo.uid) /*recipient*/,
                     resultToUid /*visible*/, true /*direct*/);
+        } else if (mStartActivity.mShareIdentity) {
+            final PackageManagerInternal pmInternal =
+                    mService.getPackageManagerInternalLocked();
+            pmInternal.grantImplicitAccess(mStartActivity.mUserId, mIntent,
+                    UserHandle.getAppId(mStartActivity.info.applicationInfo.uid) /*recipient*/,
+                    r.launchedFromUid /*visible*/, true /*direct*/);
         }
         final Task startedTask = mStartActivity.getTask();
         if (newTask) {