Merge "Print spooler crash on back before first layout is complete." into lmp-dev

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);
         }
     }

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);