Merge "Deprecate mCancel in BitmapFactory.Options API"

This commit is contained in:
Matt Sarett
2016-01-08 15:47:32 +00:00
committed by Android (Google) Code Review
4 changed files with 6 additions and 3 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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