commit 5849f20124181f35063902829fdfc4c926b4424f
author Philip P. Moltmann <moltmann@google.com> Fri Mar 18 14:25:24 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 18 14:25:25 2016 +0000
tree 334ccfbd2defef102f44dd798b7e3eca58b7c0a9
parent bb09b7bf591ffd34edd63df7082bc723a2137347
parent 32e0755afc236b13d2c3e41797acad56df7f8f74

Merge "If we finish before the the remotePrintedDocument is initialized" into nyc-dev

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 ad4823e..ec83059 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -2029,7 +2029,7 @@
     }
 
     private void doFinish() {
-        if (mPrintedDocument.isUpdating()) {
+        if (mPrintedDocument != null && mPrintedDocument.isUpdating()) {
             // The printedDocument will call doFinish() when the current command finishes
             return;
         }