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

Commit 6bc93c16 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

am: c76f44fa

Change-Id: I780866bef6d476325a93777075bfce752ad84968
parents ed1de771 c76f44fa
Loading
Loading
Loading
Loading
+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);