summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-01-24 17:26:24 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-01-24 17:26:24 +0000
commitef1a79f91aa2e10b1aa5b8b7553f0af211d5c983 (patch)
treeae86731bdbd55ac443f4f08249bf806bf8819010 /core/java
parente636dc979cf3e0b1bb60a1e68efad76e8f8047dd (diff)
parent9e1485230f5f9920961ca01f06ce80908b82e15e (diff)
Merge "Fix sharing files cross-profile from sharesheet and intent resolver"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/app/ResolverActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 68d6e03f654c..96ab0bb4afc4 100644
--- 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