summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Craik <ccraik@android.com>2013-08-27 18:07:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-27 18:07:49 +0000
commit3c0624aa1ae9c7d147a3b0f3ea8c05fc4bc4187a (patch)
tree402c611846b527fa05a76e52a45d6be327f7ee18
parent1b8c33c614a1a67fadf3f32758ac781e05dcb8aa (diff)
parent28fe1ee579db0f50beca525f24b35de5e898fa34 (diff)
downloadbase-3c0624aa1ae9c7d147a3b0f3ea8c05fc4bc4187a.tar.gz
Merge "Forward compatibility fix"
-rw-r--r--core/jni/android/graphics/GraphicsJNI.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h
index c5b06f5c3148..bdfa37d63f30 100644
--- a/core/jni/android/graphics/GraphicsJNI.h
+++ b/core/jni/android/graphics/GraphicsJNI.h
@@ -17,6 +17,12 @@ class SkPicture;
class GraphicsJNI {
public:
+ enum BitmapCreateFlags {
+ kBitmapCreateFlag_None = 0x0,
+ kBitmapCreateFlag_Mutable = 0x1,
+ kBitmapCreateFlag_Premultiplied = 0x2,
+ };
+
// returns true if an exception is set (and dumps it out to the Log)
static bool hasException(JNIEnv*);