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

Commit c7c647bb authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

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

parents 5b2fd818 3cf17ad2

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