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

Commit 84474dbe authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add ImageDecoder.Source for resources" into pi-dev am:... 

Merge "Merge "Add ImageDecoder.Source for resources" into pi-dev am: d65f5ed0" into pi-dev-plus-aosp
parents a3c96c15 4e3ccb70

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13610,6 +13610,7 @@ package android.graphics { 














  public final class ImageDecoder implements java.lang.AutoCloseable {















    method public void close();













    method public static android.graphics.ImageDecoder.Source createSource(android.content.res.Resources, int);















    method public static android.graphics.ImageDecoder.Source createSource(android.content.ContentResolver, android.net.Uri);















    method public static android.graphics.ImageDecoder.Source createSource(java.nio.ByteBuffer);















    method public static android.graphics.ImageDecoder.Source createSource(java.io.File);

























graphics/java/android/graphics/ImageDecoder.java



+2
−5




























Original line number
Diff line number
Diff line








@@ -24,7 +24,6 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;













import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;













import android.annotation.RawRes;















import android.content.ContentResolver;















import android.content.res.AssetFileDescriptor;















import android.content.res.AssetManager.AssetInputStream;










@@ -543,17 +542,15 @@ public final class ImageDecoder implements AutoCloseable {













    }































    /**













     * Create a new {@link Source} from an asset.













     * @hide













     * Create a new {@link Source} from a resource.















     *















     * @param res the {@link Resources} object containing the image data.















     * @param resId resource ID of the image data.













     *      // FIXME: Can be an @DrawableRes?















     * @return a new Source object, which can be passed to















     *      {@link #decodeDrawable} or {@link #decodeBitmap}.















     */















    @NonNull













    public static Source createSource(@NonNull Resources res, @RawRes int resId)













    public static Source createSource(@NonNull Resources res, int resId)















    {















        return new ResourceSource(res, resId);















    }