diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-27 20:21:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 20:21:48 +0000 |
| commit | dc63edf43b4b143bc8aa542593175234406630fb (patch) | |
| tree | 5864ea3aebc4e625ce0ec81ce6a6d63110d38d1f /packages/PrintSpooler | |
| parent | 04f61ee85da93f2d15034f290faec7512c176d59 (diff) | |
| parent | 34c1df3a154abb8bd495f74f5e53b91e7956e596 (diff) | |
| download | frameworks_base-dc63edf43b4b143bc8aa542593175234406630fb.zip frameworks_base-dc63edf43b4b143bc8aa542593175234406630fb.tar.gz frameworks_base-dc63edf43b4b143bc8aa542593175234406630fb.tar.bz2 | |
am 34c1df3a: am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '34c1df3a154abb8bd495f74f5e53b91e7956e596':
Pass correct extras to the custom print options activity
Diffstat (limited to 'packages/PrintSpooler')
| -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. |