commit 3cf17ad26d4b44b0cf42dbbdb24f876b01363884
author Philip P. Moltmann <moltmann@google.com> Mon Jun 27 11:41:29 2016 -0700
committer Philip P. Moltmann <moltmann@google.com> Mon Jun 27 21:06:42 2016 +0000
tree 58dd79984ca350c8448efb36212fa1fb31c526c3
parent bb7c5aca254bedb7dce4aa47e1da2782fd67d9cf

Syncronize renderPage vs. onServiceDisconnected

An async renderPage request might be in progress while the service is
getting disconnected.

Fixes: 29639740
Change-Id: I8a33e5fba96dd76ecb1e14d0e3a26334eb8965a5

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 999d82d..6140428 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java
@@ -838,9 +838,15 @@
 
                     try (ParcelFileDescriptor source = pipe[0]) {
                         try (ParcelFileDescriptor destination = pipe[1]) {
-
-                            mRenderer.renderPage(mPageIndex, bitmap.getWidth(), bitmap.getHeight(),
-                                    mRenderSpec.printAttributes, destination);
+                            synchronized (mLock) {
+                                if (mRenderer != null) {
+                                    mRenderer.renderPage(mPageIndex, bitmap.getWidth(),
+                                            bitmap.getHeight(), mRenderSpec.printAttributes,
+                                            destination);
+                                } else {
+                                    throw new IllegalStateException("Renderer is disconnected");
+                                }
+                            }
                         }
 
                         BitmapSerializeUtils.readBitmapPixels(bitmap, source);