Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 903365a9 authored by Svetoslav's avatar Svetoslav Committed by Android Git Automerger
Browse files

am 59bb49fb: am 922fcc2f: Merge "Crash in print spooler if save to PDF... 

am 59bb49fb: am 922fcc2f: Merge "Crash in print spooler if save to PDF selected early." into lmp-dev

* commit '59bb49fb':
  Crash in print spooler if save to PDF selected early.
parents 90f2f122 59bb49fb

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

+5 −1
Original line number Diff line number Diff line
@@ -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()))) {