commit e3e27067584e18a6633d7491f9c6db45c8c8a5ba
author Svetoslav <svetoslavganov@google.com> Wed Sep 24 04:13:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 24 04:13:24 2014 +0000
tree 29a9f53adac84fc87234a05db8ac89dc2ee14c57
parent d8e5296d1eeee12aabbb6ff5d82e1bbe4fb4fe45
parent ac21efee32a902abba95bb9ee9b2a17e33c39e6a

am c99f265c: am 74036092: am 6853ed42: am ea5d75d8: Merge "Print spooler crash on back before first layout is complete." into lmp-dev

* commit 'c99f265c8fefbecedd2048c111fd34125efa8933':
  Print spooler crash on back before first layout is complete.

packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java

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 @@
         if (mLastRenderSpec == null) {
             mScheduledPreloadFirstShownPage = firstShownPage;
             mScheduledPreloadLastShownPage = lastShownPage;
-        } else {
+        } else if (mState == STATE_OPENED) {
             mRenderer.startPreload(firstShownPage, lastShownPage, mLastRenderSpec);
         }
     }

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 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 @@
                 requestCreatePdfFileOrFinish();
             } break;
 
-            case STATE_PRINT_CANCELED: {
-                doFinish();
-            } break;
-
             default: {
                 updatePrintPreviewController(document.changed);