diff --git a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java index 0f64f6da63f75..292a50b77ecce 100644 --- a/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java +++ b/core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java @@ -583,6 +583,13 @@ public final class SystemUiDeviceConfigFlags { */ public static final String CLIPBOARD_OVERLAY_SHOW_ACTIONS = "clipboard_overlay_show_actions"; + /** + * (boolean) Whether to ignore the source package for determining whether to use remote copy + * behavior in the clipboard UI. + */ + public static final String CLIPBOARD_IGNORE_REMOTE_COPY_SOURCE = + "clipboard_ignore_remote_copy_source"; + /** * (boolean) Whether to combine the broadcasts APPWIDGET_ENABLED and APPWIDGET_UPDATE */ diff --git a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java index cece764580d15..c194e66f8e92a 100644 --- a/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java +++ b/packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayUtils.java @@ -20,7 +20,10 @@ import android.content.ClipData; import android.content.ClipDescription; import android.content.ComponentName; import android.content.Context; +import android.os.Build; +import android.provider.DeviceConfig; +import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; import com.android.systemui.R; import javax.inject.Inject; @@ -35,6 +38,12 @@ class ClipboardOverlayUtils { if (clipData != null && clipData.getDescription().getExtras() != null && clipData.getDescription().getExtras().getBoolean( ClipDescription.EXTRA_IS_REMOTE_DEVICE)) { + if (Build.isDebuggable() && DeviceConfig.getBoolean( + DeviceConfig.NAMESPACE_SYSTEMUI, + SystemUiDeviceConfigFlags.CLIPBOARD_IGNORE_REMOTE_COPY_SOURCE, + false)) { + return true; + } ComponentName remoteComponent = ComponentName.unflattenFromString( context.getResources().getString(R.string.config_remoteCopyPackage)); if (remoteComponent != null) {