Merge "Fix incorrect cross-profile share check." into main

2 files changed, 5 insertions, 4 deletions

diff --git a/java/src/com/android/intentresolver/ResolverListAdapter.java b/java/src/com/android/intentresolver/ResolverListAdapter.java
index 9843cf8d..2a8fcfa4 100644
--- a/java/src/com/android/intentresolver/ResolverListAdapter.java
+++ b/java/src/com/android/intentresolver/ResolverListAdapter.java
@@ -840,7 +840,7 @@ public class ResolverListAdapter extends BaseAdapter {
                 userHandle);
     }
 
-    public final List<Intent> getIntents() {
+    public List<Intent> getIntents() {
         // TODO: immutable copy?
         return mIntents;
     }
diff --git a/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
index e6d5d1c4..2b4a7ada 100644
--- a/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
+++ b/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
@@ -34,8 +34,8 @@ import com.android.intentresolver.shared.model.User;
 import java.util.List;
 
 /**
- * Empty state provider that does not allow cross profile sharing, it will return a blocker
- * in case if the profile of the current tab is not the same as the profile of the calling app.
+ * Empty state provider that informs about a lack of cross profile sharing. It will return
+ * an empty state in case there are no intents which can be forwarded to another profile.
  */
 public class NoCrossProfileEmptyStateProvider implements EmptyStateProvider {
 
@@ -79,7 +79,8 @@ public class NoCrossProfileEmptyStateProvider implements EmptyStateProvider {
 
         // Allow access to the tab when launched by the same user as the tab owner
         // or when there is at least one target which is permitted for cross-profile.
-        if (launchedAsSameUser || anyCrossProfileAllowedIntents(adapter, tabOwnerHandle)) {
+        if (launchedAsSameUser || anyCrossProfileAllowedIntents(adapter,
+                /* source = */ launchedAs.getHandle())) {
             return null;
         }