diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-24 17:17:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-24 17:17:24 +0000 |
| commit | f64d6f8baf87e1da8ae9cb0f26fd4dbb37c0ec7f (patch) | |
| tree | cea6d09c0d8a8ce6ce8e9966c3730ac0f21995f1 /packages/PrintSpooler | |
| parent | 9c2c3f3b60c148dafc3bdcdcf09b181d3be29301 (diff) | |
| parent | e3e27067584e18a6633d7491f9c6db45c8c8a5ba (diff) | |
| download | frameworks_base-f64d6f8baf87e1da8ae9cb0f26fd4dbb37c0ec7f.zip frameworks_base-f64d6f8baf87e1da8ae9cb0f26fd4dbb37c0ec7f.tar.gz frameworks_base-f64d6f8baf87e1da8ae9cb0f26fd4dbb37c0ec7f.tar.bz2 | |
am 86822226: am c99f265c: am 74036092: am 6853ed42: am ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev
* commit '8682222655f96f0dcbe27f65496ad33e49e00ecc':
Print spooler crash on back before first layout is complete.
Diffstat (limited to 'packages/PrintSpooler')
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java | 2 | ||||
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java b/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java index f779f87..eb2c920 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java +++ b/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java @@ -125,7 +125,7 @@ public final class PageContentRepository { if (mLastRenderSpec == null) { mScheduledPreloadFirstShownPage = firstShownPage; mScheduledPreloadLastShownPage = lastShownPage; - } else { + } else if (mState == STATE_OPENED) { mRenderer.startPreload(firstShownPage, lastShownPage, mLastRenderSpec); } } diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index 56497d7..6de19c9 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -471,10 +471,6 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat requestCreatePdfFileOrFinish(); } break; - case STATE_PRINT_CANCELED: { - doFinish(); - } break; - default: { updatePrintPreviewController(document.changed); |