diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-28 21:00:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-28 21:00:23 +0000 |
| commit | 922fcc2f9e2370b34672af0e91e5754c6f8d6da7 (patch) | |
| tree | 5be20d4d6b183823d22e0441934acd25f2ebf154 /packages/PrintSpooler/src | |
| parent | b179bed35302704bce809029ab424f919de351c3 (diff) | |
| parent | e1dcb397d595c110faadaae6bab861bae97717b8 (diff) | |
| download | frameworks_base-922fcc2f9e2370b34672af0e91e5754c6f8d6da7.zip frameworks_base-922fcc2f9e2370b34672af0e91e5754c6f8d6da7.tar.gz frameworks_base-922fcc2f9e2370b34672af0e91e5754c6f8d6da7.tar.bz2 | |
Merge "Crash in print spooler if save to PDF selected early." into lmp-dev
Diffstat (limited to 'packages/PrintSpooler/src')
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java | 6 |
1 files changed, 5 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 72916ea..84ada6f 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -566,6 +566,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat } private void startCreateDocumentActivity() { + if (!isResumed()) { + return; + } PrintDocumentInfo info = mPrintedDocument.getDocumentInfo().info; if (info == null) { return; @@ -1372,7 +1375,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat mPrintButton.setImageResource(R.drawable.ic_menu_savetopdf); mPrintButton.setContentDescription(getString(R.string.savetopdf_button)); } - if ((mRangeOptionsSpinner.getSelectedItemPosition() == 1 + if (!mPrintedDocument.getDocumentInfo().laidout + ||(mRangeOptionsSpinner.getSelectedItemPosition() == 1 && (TextUtils.isEmpty(mPageRangeEditText.getText()) || hasErrors())) || (mRangeOptionsSpinner.getSelectedItemPosition() == 0 && (mPrintedDocument.getDocumentInfo() == null || hasErrors()))) { |