commit 8a54da92ce3da393396bbf0ff86d9525089dcdbf
author Svetoslav Ganov <svetoslavganov@google.com> Mon Jul 27 19:23:37 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 27 19:23:37 2015 +0000
tree b0702cf41e14130d8104a29b9ec74e2cbee43954
parent 9e49b5d679672ea4a64382f9a36663c73603961b
parent f12b393ff406a3bb8967b69a9be2dd27b0725b33

Merge "Pass correct extras to the custom print options activity" into mnc-dev

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

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 @@
         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.