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

Commit ae1e8855 authored by Leon Scroggins III's avatar Leon Scroggins III Committed by Android Git Automerger
Browse files

am 8e4b16d6: Merge "Update docs to state that mark is no longer called." into klp-dev 

* commit '8e4b16d6':
  Update docs to state that mark is no longer called.
parents 607ea331 8e4b16d6

graphics/java/android/graphics/BitmapFactory.java

+5 −0
Original line number Diff line number Diff line
@@ -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

graphics/java/android/graphics/BitmapRegionDecoder.java

+5 −0
Original line number Diff line number Diff line
@@ -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 {