Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae0bd0bd authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Only send uri in share intent if present in clip" into tm-qpr-dev

parents cfaad7ff 4039ba86

packages/SystemUI/src/com/android/systemui/clipboardoverlay/ClipboardOverlayController.java

+5 −3
Original line number Diff line number Diff line
@@ -522,11 +522,13 @@ public class ClipboardOverlayController { 
    private void shareContent(ClipData clip) {

        mUiEventLogger.log(CLIPBOARD_OVERLAY_SHARE_TAPPED);

        Intent shareIntent = new Intent(Intent.ACTION_SEND);

        shareIntent.putExtra(Intent.EXTRA_TEXT, clip.getItemAt(0).getText().toString());

        shareIntent.setDataAndType(

                clip.getItemAt(0).getUri(), clip.getDescription().getMimeType(0));

        shareIntent.putExtra(Intent.EXTRA_TEXT, clip.getItemAt(0).getText().toString());

        if (clip.getItemAt(0).getUri() != null) {

            shareIntent.putExtra(Intent.EXTRA_STREAM, clip.getItemAt(0).getUri());

            shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

        }

        Intent chooserIntent = Intent.createChooser(shareIntent, null)

                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)

                .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);