From 51b75386a8f6a90e833002d2d1fed928039841e7 Mon Sep 17 00:00:00 2001
From: Matt Sarett <msarett@google.com>
Date: Thu, 7 Jan 2016 16:37:38 -0500
Subject: [PATCH] Deprecate mCancel in BitmapFactory.Options API

This is a follow-up to:
https://googleplex-android-review.git.corp.google.com/#/c/837260/

BUG:26266063
Change-Id: I4a5a9c7bd1f04f27f096ce74668d1509791e1952
---
 api/current.txt                                   | 2 +-
 api/system-current.txt                            | 2 +-
 api/test-current.txt                              | 2 +-
 graphics/java/android/graphics/BitmapFactory.java | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 2638bb62424ae..23dd82760d0f3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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;
diff --git a/api/system-current.txt b/api/system-current.txt
index 795d631f89099..2df4549e84606 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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;
diff --git a/api/test-current.txt b/api/test-current.txt
index 8199c0948b082..016201c9d7ed9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -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;
diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 175c726072ccf..447a4c4e8345c 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -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