diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-27 19:23:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-27 19:23:37 +0000 |
| commit | 8a54da92ce3da393396bbf0ff86d9525089dcdbf (patch) | |
| tree | b0702cf41e14130d8104a29b9ec74e2cbee43954 /packages | |
| parent | 9e49b5d679672ea4a64382f9a36663c73603961b (diff) | |
| parent | f12b393ff406a3bb8967b69a9be2dd27b0725b33 (diff) | |
| download | frameworks_base-8a54da92ce3da393396bbf0ff86d9525089dcdbf.zip frameworks_base-8a54da92ce3da393396bbf0ff86d9525089dcdbf.tar.gz frameworks_base-8a54da92ce3da393396bbf0ff86d9525089dcdbf.tar.bz2 | |
Merge "Pass correct extras to the custom print options activity" into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index 3c5dae3..6baa4b3 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -679,7 +679,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat if (resolvedActivities.get(0).activityInfo.exported) { intent.putExtra(PrintService.EXTRA_PRINT_JOB_INFO, mPrintJob); intent.putExtra(PrintService.EXTRA_PRINTER_INFO, printer); - intent.putExtra(PrintService.EXTRA_PRINT_JOB_INFO, + intent.putExtra(PrintService.EXTRA_PRINT_DOCUMENT_INFO, mPrintedDocument.getDocumentInfo().info); // This is external activity and may not be there. |