Merge "Expose ImageDecoder#createSource(byte[] (, int, int))"

This commit is contained in:
TreeHugger Robot
2020-03-31 21:04:00 +00:00
committed by Android (Google) Code Review
2 changed files with 21 additions and 3 deletions

View File

@@ -939,6 +939,12 @@ public final class ImageDecoder implements AutoCloseable {
/**
* Create a new {@link Source Source} from a byte array.
*
* <p>Note: If this {@code Source} is passed to {@link #decodeDrawable decodeDrawable},
* and the encoded image is animated, the returned {@link AnimatedImageDrawable}
* will continue reading from {@code data}, so its contents must not
* be modified, even after the {@code AnimatedImageDrawable} is returned.
* {@code data}'s contents should never be modified during decode.</p>
*
* @param data byte array of compressed image data.
* @param offset offset into data for where the decoder should begin
* parsing.
@@ -949,7 +955,6 @@ public final class ImageDecoder implements AutoCloseable {
* @throws NullPointerException if data is null.
* @throws ArrayIndexOutOfBoundsException if offset and length are
* not within data.
* @hide
*/
@AnyThread
@NonNull
@@ -967,8 +972,19 @@ public final class ImageDecoder implements AutoCloseable {
}
/**
* See {@link #createSource(byte[], int, int).
* @hide
* Create a new {@link Source Source} from a byte array.
*
* <p>Note: If this {@code Source} is passed to {@link #decodeDrawable decodeDrawable},
* and the encoded image is animated, the returned {@link AnimatedImageDrawable}
* will continue reading from {@code data}, so its contents must not
* be modified, even after the {@code AnimatedImageDrawable} is returned.
* {@code data}'s contents should never be modified during decode.</p>
*
* @param data byte array of compressed image data.
* @return a new Source object, which can be passed to
* {@link #decodeDrawable decodeDrawable} or
* {@link #decodeBitmap decodeBitmap}.
* @throws NullPointerException if data is null.
*/
@AnyThread
@NonNull