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

Commit fe3df2ad authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

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

parents 69a37e8e c57f0cb7

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

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

        int requestCode = mContext.getUserId();





        // Create a edit action

        // Create a edit action

        PendingIntent editAction = PendingIntent.getBroadcastAsUser(context, requestCode,

        PendingIntent editAction = PendingIntent.getBroadcast(context, requestCode,

                new Intent(context, GlobalScreenshot.ActionProxyReceiver.class)

                new Intent(context, GlobalScreenshot.ActionProxyReceiver.class)

                        .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, editIntent)

                        .putExtra(GlobalScreenshot.EXTRA_ACTION_INTENT, editIntent)

                        .putExtra(GlobalScreenshot.EXTRA_CANCEL_NOTIFICATION,

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

                                mSmartActionsEnabled)

                        .setAction(Intent.ACTION_EDIT)

                        .setAction(Intent.ACTION_EDIT)

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND),

                PendingIntent.FLAG_CANCEL_CURRENT, UserHandle.SYSTEM);

                PendingIntent.FLAG_CANCEL_CURRENT);

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

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

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

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

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

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