Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c76f44fa authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge \"Syncronize renderPage vs. onServiceDisconnected\" into nyc-mr1-dev 

am: c7c647bb

Change-Id: Ibd18df2822dbb0993eb4fc22392c3c523197c540
parents c8fea44e c7c647bb

packages/PrintSpooler/src/com/android/printspooler/model/PageContentRepository.java

+9 −3
Original line number Diff line number Diff line
@@ -838,9 +838,15 @@ public final class PageContentRepository { 


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