Merge "Change remote copy intent behavior." into tm-dev am: 4d6f731761 am: 4b31535805 am: f96704530c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18557688

Change-Id: I27a2dc901a1b1dd448e22fd517487eb87213f4b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
index 345f8a3c15d6..3714c15af173 100644
--- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
+++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java
@@ -635,12 +635,13 @@ public class ClipboardOverlayController {
     }
 
     private Intent getRemoteCopyIntent(ClipData clipData) {
+        Intent nearbyIntent = new Intent(REMOTE_COPY_ACTION);
+
         String remoteCopyPackage = mContext.getString(R.string.config_remoteCopyPackage);
-        if (TextUtils.isEmpty(remoteCopyPackage)) {
-            return null;
+        if (!TextUtils.isEmpty(remoteCopyPackage)) {
+            nearbyIntent.setComponent(ComponentName.unflattenFromString(remoteCopyPackage));
         }
-        Intent nearbyIntent = new Intent(REMOTE_COPY_ACTION);
-        nearbyIntent.setComponent(ComponentName.unflattenFromString(remoteCopyPackage));
+
         nearbyIntent.setClipData(clipData);
         nearbyIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         nearbyIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);