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

Commit c8e7451d authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Ensure screenshot edit action gets permissions for current user" into rvc-dev am: fe3df2ad 

Change-Id: If81acc0f66ba8c0bcef3a7c4f33dc639f9bb297d
parents 9c9715e3 fe3df2ad

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

+2 −2
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        int requestCode = mContext.getUserId();



        // Create a edit action

        PendingIntent editAction = PendingIntent.getBroadcastAsUser(context, requestCode,

        PendingIntent editAction = PendingIntent.getBroadcast(context, requestCode,

                new Intent(context, GlobalScreenshot.ActionProxyReceiver.class)

                        .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, editIntent)

                        .putExtra(GlobalScreenshot.EXTRA_CANCEL_NOTIFICATION,
@@ -341,7 +341,7 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
                                mSmartActionsEnabled)

                        .setAction(Intent.ACTION_EDIT)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);

                PendingIntent.FLAG_CANCEL_CURRENT);

        Notification.Action.Builder editActionBuilder = new Notification.Action.Builder(

                Icon.createWithResource(r, R.drawable.ic_screenshot_edit),

                r.getString(com.android.internal.R.string.screenshot_edit), editAction);