commit 922fcc2f9e2370b34672af0e91e5754c6f8d6da7
author Svetoslav <svetoslavganov@google.com> Sun Sep 28 21:00:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 28 21:00:23 2014 +0000
tree 5be20d4d6b183823d22e0441934acd25f2ebf154
parent b179bed35302704bce809029ab424f919de351c3
parent e1dcb397d595c110faadaae6bab861bae97717b8

Merge "Crash in print spooler if save to PDF selected early." into lmp-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 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 @@
     }
 
     private void startCreateDocumentActivity() {
+        if (!isResumed()) {
+            return;
+        }
         PrintDocumentInfo info = mPrintedDocument.getDocumentInfo().info;
         if (info == null) {
             return;
@@ -1372,7 +1375,8 @@
             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()))) {