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

Commit 104e6021 authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Iab3b086b0eb078cdd75a02a2232360420f09b348
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e38b3413 ae0bd0bd

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);