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

Commit c03c596a authored by Matt Sarett's avatar Matt Sarett Committed by Android (Google) Code Review
Browse files

Merge "Deprecate mCancel in BitmapFactory.Options API"

parents 5942cc59 51b75386

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11297,7 +11297,7 @@ package android.graphics { 
    field public int inScreenDensity;

    field public int inTargetDensity;

    field public byte[] inTempStorage;

    field public boolean mCancel;

    field public deprecated boolean mCancel;

    field public int outHeight;

    field public java.lang.String outMimeType;

    field public int outWidth;

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11651,7 +11651,7 @@ package android.graphics { 
    field public int inScreenDensity;

    field public int inTargetDensity;

    field public byte[] inTempStorage;

    field public boolean mCancel;

    field public deprecated boolean mCancel;

    field public int outHeight;

    field public java.lang.String outMimeType;

    field public int outWidth;

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11305,7 +11305,7 @@ package android.graphics { 
    field public int inScreenDensity;

    field public int inTargetDensity;

    field public byte[] inTempStorage;

    field public boolean mCancel;

    field public deprecated boolean mCancel;

    field public int outHeight;

    field public java.lang.String outMimeType;

    field public int outWidth;

graphics/java/android/graphics/BitmapFactory.java

+3 −0
Original line number Diff line number Diff line
@@ -355,6 +355,9 @@ public class BitmapFactory { 
        public byte[] inTempStorage;



        /**

         * @deprecated As of {@link android.os.Build.VERSION_CODES#N}, see

         * comments on {@link #requestCancelDecode()}.

         *

         * Flag to indicate that cancel has been called on this object.  This

         * is useful if there's an intermediary that wants to first decode the

         * bounds and then decode the image.  In that case the intermediary