commit 8737333d533cf95206466bffd204c8e3cc4ca15e
author Zak Cohen <zakcohen@google.com> Fri Mar 12 05:34:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 12 05:34:22 2021 +0000
tree bc1b04865b40495125bf197b0c12447d81021dfb
parent aba329be0e44e422c85625f83c8f692632c2e8af
parent 7575baadb48bce1529d3c924962c61234608fd8e

Overview - make drag share targets work with Work Profile am: 7575baadb4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13500576

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52854a5bb38abd3e34e60eaaed71f82ebef5d437

quickstep/src/com/android/quickstep/util/ImageActionUtils.java

diff --git a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
index d022085..0f2d778 100644
--- a/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
+++ b/quickstep/src/com/android/quickstep/util/ImageActionUtils.java
@@ -99,7 +99,14 @@
             .putExtra(Intent.EXTRA_STREAM, uri)
             .putExtra(Intent.EXTRA_SHORTCUT_ID, shortcutInfo.getId())
             .setClipData(clipdata);
-        context.startActivity(intent);
+
+        if (context.getUserId() != appTarget.getUser().getIdentifier()) {
+            intent.prepareToLeaveUser(context.getUserId());
+            intent.fixUris(context.getUserId());
+            context.startActivityAsUser(intent, appTarget.getUser());
+        } else {
+            context.startActivity(intent);
+        }
     }
 
     /**