Merge "Fix sharing files cross-profile from sharesheet and intent resolver"

2020-01-24 17:26:24 +00:00
parent e636dc979c 9e1485230f
commit ef1a79f91a
1 changed files with 3 additions and 0 deletions
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -1101,6 +1101,9 @@ public class ResolverActivity extends Activity implements
        }

        if (target != null) {
+            if (intent != null) {
+                intent.fixUris(UserHandle.myUserId());
+            }
            safelyStartActivity(target);

            // Rely on the ActivityManager to pop up a dialog regarding app suspension