diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2014-12-02 19:03:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 19:03:54 +0000 |
| commit | 66a1200156aa0d7b003ce6d7dacfa5c1a54dd0d7 (patch) | |
| tree | c45ac942f534ca2def4951bf574e4cb30cc7fadd /packages/PrintSpooler | |
| parent | e67cf73146cecce5be22264ca7c596b454ded08d (diff) | |
| parent | f9c93ba26790cf26df40d21d7e8b6e1e83391dd1 (diff) | |
| download | frameworks_base-66a1200156aa0d7b003ce6d7dacfa5c1a54dd0d7.zip frameworks_base-66a1200156aa0d7b003ce6d7dacfa5c1a54dd0d7.tar.gz frameworks_base-66a1200156aa0d7b003ce6d7dacfa5c1a54dd0d7.tar.bz2 | |
am f9c93ba2: am eaaf0512: Crash in print spooler when back pressed before content update complted.
* commit 'f9c93ba26790cf26df40d21d7e8b6e1e83391dd1':
Crash in print spooler when back pressed before content update complted.
Diffstat (limited to 'packages/PrintSpooler')
| -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); |