diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-07-27 19:59:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-27 19:59:10 +0000 |
| commit | 34c1df3a154abb8bd495f74f5e53b91e7956e596 (patch) | |
| tree | 7346bd23e90695107109b0a04795091a218f1d27 /packages/PrintSpooler | |
| parent | f040100cbde4b551dd551a8b0b9eb7194116a95b (diff) | |
| parent | 9124c1784d6537827a6b6423f58572395d8fb820 (diff) | |
| download | frameworks_base-34c1df3a154abb8bd495f74f5e53b91e7956e596.zip frameworks_base-34c1df3a154abb8bd495f74f5e53b91e7956e596.tar.gz frameworks_base-34c1df3a154abb8bd495f74f5e53b91e7956e596.tar.bz2 | |
am 9124c178: am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev
* commit '9124c1784d6537827a6b6423f58572395d8fb820':
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. |