From 7c510c22275911d227d78a26108f982e421fdf71 Mon Sep 17 00:00:00 2001
From: arangelov <arangelov@google.com>
Date: Wed, 3 Jun 2020 18:24:40 +0100
Subject: [PATCH] Also call Intent#fixUris for the intent resolver case

Fixes: 158082179
Test: manual
Test: atest ChooserActivityTest
Test: atest ResolverActivityTest
Change-Id: I74c97f5d2f3bbbcd35df20151a455877562f34ad
---
 core/java/com/android/internal/app/ChooserActivity.java  | 4 ----
 core/java/com/android/internal/app/ResolverActivity.java | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 6f00cee0cc7e8..6a40fb8775b32 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -3027,10 +3027,6 @@ public class ChooserActivity extends ResolverActivity implements
         currentRootAdapter.updateDirectShareExpansion();
     }
 
-    void prepareIntentForCrossProfileLaunch(Intent intent) {
-        intent.fixUris(UserHandle.myUserId());
-    }
-
     @Override
     protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
         if (shouldShowTabs()) {
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index f96f560fc60fa..26fb08a5b9149 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1250,7 +1250,9 @@ public class ResolverActivity extends Activity implements
         return true;
     }
 
-    void prepareIntentForCrossProfileLaunch(Intent intent) {}
+    private void prepareIntentForCrossProfileLaunch(Intent intent) {
+        intent.fixUris(UserHandle.myUserId());
+    }
 
     private boolean isLaunchingTargetInOtherProfile() {
         return mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier()