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

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

Merge "Add FLAG_CANCEL_CURRENT to screenshot share intent" into rvc-dev am:... 

Merge "Add FLAG_CANCEL_CURRENT to screenshot share intent" into rvc-dev am: 98b129d0 am: 9285a265 am: ee8bcf2d am: 211a9119

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

Change-Id: I5b7ed5e0e19b7003dc952ab49da1155fb2477c15
parents edbc750b 211a9119

packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -281,8 +281,10 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                Intent.createChooser(sharingIntent, null, chooserAction.getIntentSender())

                Intent.createChooser(sharingIntent, null, chooserAction.getIntentSender())

                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)

                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)

                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

        PendingIntent pendingIntent = PendingIntent.getActivityAsUser(context, requestCode,



                sharingChooserIntent, 0, null, UserHandle.CURRENT);

        // cancel current pending intent (if any) since clipData isn't used for matching

        PendingIntent pendingIntent = PendingIntent.getActivityAsUser(context, 0,

                sharingChooserIntent, PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);





        // Create a share action for the notification

        // Create a share action for the notification

        PendingIntent shareAction = PendingIntent.getBroadcastAsUser(context, requestCode,

        PendingIntent shareAction = PendingIntent.getBroadcastAsUser(context, requestCode,