diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2014-11-01 00:27:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-11-01 00:27:30 +0000 |
| commit | 28d51a39a1bed35855b0fe75a65ad4a6d43a4460 (patch) | |
| tree | 17b462f2d8687317d2873ec6247d3eabf69c06e6 /graphics | |
| parent | 8252b827db73004bdf97c6ac31f3a58f26148e03 (diff) | |
| parent | 4f5b8a6b9b1966b42c929f89e1e91827ec495719 (diff) | |
| download | frameworks_base-28d51a39a1bed35855b0fe75a65ad4a6d43a4460.zip frameworks_base-28d51a39a1bed35855b0fe75a65ad4a6d43a4460.tar.gz frameworks_base-28d51a39a1bed35855b0fe75a65ad4a6d43a4460.tar.bz2 | |
am 182f0a13: Merge "Crash apps that print malformed or password protected PDFs." into lmp-mr1-dev
automerge: 4f5b8a6
* commit '4f5b8a6b9b1966b42c929f89e1e91827ec495719':
Crash apps that print malformed or password protected PDFs.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/pdf/PdfEditor.java | 4 | ||||
| -rw-r--r-- | graphics/java/android/graphics/pdf/PdfRenderer.java | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/pdf/PdfEditor.java b/graphics/java/android/graphics/pdf/PdfEditor.java index 0b84d29..2b70b6a 100644 --- a/graphics/java/android/graphics/pdf/PdfEditor.java +++ b/graphics/java/android/graphics/pdf/PdfEditor.java @@ -59,6 +59,10 @@ public final class PdfEditor { * * @param input Seekable file descriptor to read from. * + * @throws java.io.IOException If an error occurs while reading the file. + * @throws java.lang.SecurityException If the file requires a password or + * the security scheme is not supported. + * * @see #close() */ public PdfEditor(@NonNull ParcelFileDescriptor input) throws IOException { diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java index 359c294..79934da 100644 --- a/graphics/java/android/graphics/pdf/PdfRenderer.java +++ b/graphics/java/android/graphics/pdf/PdfRenderer.java @@ -131,6 +131,10 @@ public final class PdfRenderer implements AutoCloseable { * </p> * * @param input Seekable file descriptor to read from. + * + * @throws java.io.IOException If an error occurs while reading the file. + * @throws java.lang.SecurityException If the file requires a password or + * the security scheme is not supported. */ public PdfRenderer(@NonNull ParcelFileDescriptor input) throws IOException { if (input == null) { |