diff options
| author | Svetoslav <svetoslavganov@google.com> | 2014-09-23 23:52:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-23 23:52:59 +0000 |
| commit | 2eefd97be6de580a5df421e59e2a6d9b0943a291 (patch) | |
| tree | 8962125e6f4e7543802811a1845948a65d10a71e | |
| parent | abe2df111f8b6952f5de2a07c189b4f440161194 (diff) | |
| parent | 254361f136aa9461e16f11f0170fde05e83a1b92 (diff) | |
| download | frameworks_base-2eefd97be6de580a5df421e59e2a6d9b0943a291.zip frameworks_base-2eefd97be6de580a5df421e59e2a6d9b0943a291.tar.gz frameworks_base-2eefd97be6de580a5df421e59e2a6d9b0943a291.tar.bz2 | |
Merge "Print spooler crash on back before first layout is complete." into lmp-dev
| -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); |