Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '922fcc2f9e2370b34672af0e91e5754c6f8d6da7':
  Crash in print spooler if save to PDF selected early.
This commit is contained in:
Svetoslav
2014-09-29 02:55:26 +00:00
committed by Android Git Automerger
parent 1fd7359038 922fcc2f9e
commit 59bb49fbf7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
View File

@@ -566,6 +566,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
} }
private void startCreateDocumentActivity() { private void startCreateDocumentActivity() {
if (!isResumed()) {
return;
}
PrintDocumentInfo info = mPrintedDocument.getDocumentInfo().info; PrintDocumentInfo info = mPrintedDocument.getDocumentInfo().info;
if (info == null) { if (info == null) {
return; return;
@@ -1372,7 +1375,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
mPrintButton.setImageResource(R.drawable.ic_menu_savetopdf); mPrintButton.setImageResource(R.drawable.ic_menu_savetopdf);
mPrintButton.setContentDescription(getString(R.string.savetopdf_button)); mPrintButton.setContentDescription(getString(R.string.savetopdf_button));
} }
if ((mRangeOptionsSpinner.getSelectedItemPosition() == 1 if (!mPrintedDocument.getDocumentInfo().laidout
||(mRangeOptionsSpinner.getSelectedItemPosition() == 1
&& (TextUtils.isEmpty(mPageRangeEditText.getText()) || hasErrors())) && (TextUtils.isEmpty(mPageRangeEditText.getText()) || hasErrors()))
|| (mRangeOptionsSpinner.getSelectedItemPosition() == 0 || (mRangeOptionsSpinner.getSelectedItemPosition() == 0
&& (mPrintedDocument.getDocumentInfo() == null || hasErrors()))) { && (mPrintedDocument.getDocumentInfo() == null || hasErrors()))) {