summaryrefslogtreecommitdiffstats
path: root/core/jni/android
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2014-02-13 14:34:02 -0500
committerLeon Scroggins <scroggo@google.com>2014-02-17 10:46:39 -0500
commit73c04711ca13c99f29a84de8cfc6c780811a8f63 (patch)
tree497cd78e24086dad4a94ee4db54b0df1c5e6ad4a /core/jni/android
parent83e2bd1b2655275bd87de22e94ed5d06fe3fc585 (diff)
downloadframeworks_base-73c04711ca13c99f29a84de8cfc6c780811a8f63.zip
frameworks_base-73c04711ca13c99f29a84de8cfc6c780811a8f63.tar.gz
frameworks_base-73c04711ca13c99f29a84de8cfc6c780811a8f63.tar.bz2
Remove call to setIsOpaque (again).
The call was removed in I1b36b0b0ce7126031eb7b769b563c17dcd4b306a, since setIsOpaque was deprecated in Skia. It was accidentally reintroduced in Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71. This line is redundant with the lines above it (which call the replacement for setIsOpaque, setAlphaType). Change-Id: I6520f796d639721987418ec0ecae82b3674dcbfd
Diffstat (limited to 'core/jni/android')
-rw-r--r--core/jni/android/graphics/Bitmap.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index 24160ab..d97a945 100644
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -466,7 +466,6 @@ static void Bitmap_setAlphaAndPremultiplied(JNIEnv* env, jobject, jlong bitmapHa
} else {
bitmap->setAlphaType(kUnpremul_SkAlphaType);
}
- bitmap->setIsOpaque(!hasAlpha);
}
static jboolean Bitmap_hasMipMap(JNIEnv* env, jobject, jlong bitmapHandle) {