diff options
-rw-r--r-- | graphics/java/android/graphics/BitmapFactory.java | 5 | ||||
-rw-r--r-- | graphics/java/android/graphics/BitmapRegionDecoder.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index c8ace44..a7c5b20 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -553,6 +553,11 @@ public class BitmapFactory { * @return The decoded bitmap, or null if the image data could not be * decoded, or, if opts is non-null, if opts requested only the * size be returned (in opts.outWidth and opts.outHeight) + * + * <p class="note">Prior to {@link android.os.Build.VERSION_CODES#KITKAT}, + * if {@link InputStream#markSupported is.markSupported()} returns true, + * <code>is.mark(1024)</code> would be called. As of + * {@link android.os.Build.VERSION_CODES#KITKAT}, this is no longer the case.</p> */ public static Bitmap decodeStream(InputStream is, Rect outPadding, Options opts) { // we don't throw in this case, thus allowing the caller to only check diff --git a/graphics/java/android/graphics/BitmapRegionDecoder.java b/graphics/java/android/graphics/BitmapRegionDecoder.java index 3524b25..3a99977 100644 --- a/graphics/java/android/graphics/BitmapRegionDecoder.java +++ b/graphics/java/android/graphics/BitmapRegionDecoder.java @@ -104,6 +104,11 @@ public final class BitmapRegionDecoder { * allowing sharing may degrade the decoding speed. * @return BitmapRegionDecoder, or null if the image data could not be decoded. * @throws IOException if the image format is not supported or can not be decoded. + * + * <p class="note">Prior to {@link android.os.Build.VERSION_CODES#KITKAT}, + * if {@link InputStream#markSupported is.markSupported()} returns true, + * <code>is.mark(1024)</code> would be called. As of + * {@link android.os.Build.VERSION_CODES#KITKAT}, this is no longer the case.</p> */ public static BitmapRegionDecoder newInstance(InputStream is, boolean isShareable) throws IOException { |