diff options
| author | 2020-01-15 21:11:51 +0000 | |
|---|---|---|
| committer | 2020-01-15 21:11:51 +0000 | |
| commit | 9e1485230f5f9920961ca01f06ce80908b82e15e (patch) | |
| tree | 49888d4b5d9e33c613698916b9c034312eaf73b8 | |
| parent | 5f322de2d666aa4f4a5d1f4e211f619167e448b3 (diff) | |
Fix sharing files cross-profile from sharesheet and intent resolver
The fix is to include the user id in the content uri, which is
handled via Intent#fixUris.
Bug: 142537267
Bug: 142538125
Test: atest com.android.internal.app.ChooserActivityTest
Test: atest com.android.internal.app.ResolverActivityTest
Test: manually share an image from personal profile to work profile
Test: manually share an image from work profile to personal profile
Change-Id: Ib0ffd546188a78a871a08ea4daf45eb27664706a
| -rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 3 |
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 b2417b2e79cc..5b6b62ca0b10 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -1082,6 +1082,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 |