From c859cd068b3a63be962a201db46f487d13be56da Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Tue, 7 Jun 2016 17:04:25 -0700
Subject: [PATCH] Fix up issues in PdfRenderer found by test.

Change-Id: I56e403fd425e4b4353383c43077de5c47ff22b5c
---
 graphics/java/android/graphics/pdf/PdfRenderer.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java
index cfc130990e926..7f115b5e05c88 100644
--- a/graphics/java/android/graphics/pdf/PdfRenderer.java
+++ b/graphics/java/android/graphics/pdf/PdfRenderer.java
@@ -163,7 +163,12 @@ public final class PdfRenderer implements AutoCloseable {
 
         synchronized (sPdfiumLock) {
             mNativeDocument = nativeCreate(mInput.getFd(), size);
-            mPageCount = nativeGetPageCount(mNativeDocument);
+            try {
+                mPageCount = nativeGetPageCount(mNativeDocument);
+            } catch (Throwable t) {
+                nativeClose(mNativeDocument);
+                throw t;
+            }
         }
 
         mCloseGuard.open("close");
@@ -368,6 +373,8 @@ public final class PdfRenderer implements AutoCloseable {
          */
         public void render(@NonNull Bitmap destination, @Nullable Rect destClip,
                            @Nullable Matrix transform, @RenderMode int renderMode) {
+            throwIfClosed();
+
             if (destination.getConfig() != Config.ARGB_8888) {
                 throw new IllegalArgumentException("Unsupported pixel format");
             }