diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java | 4 | ||||
| -rw-r--r-- | packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java b/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java index 90875c0..ea6281d 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java +++ b/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java @@ -486,7 +486,9 @@ public final class PageContentRepository { protected Void doInBackground(Void... params) { synchronized (mLock) { try { - mRenderer.closeDocument(); + if (mRenderer != null) { + mRenderer.closeDocument(); + } } catch (RemoteException re) { /* ignore */ } diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index 352b545..f3a5c95 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -487,6 +487,10 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat requestCreatePdfFileOrFinish(); } break; + case STATE_PRINT_CANCELED: { + updateOptionsUi(); + } break; + default: { updatePrintPreviewController(document.changed); |