Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matt Casey
2020-05-21 01:22:15 +00:00
committed by Android (Google) Code Review
parent 69a37e8e1a c57f0cb7f2
commit fe3df2ad27
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/screenshot/SaveImageInBackgroundTask.java
View File

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