diff options
author | Chet Haase <chet@google.com> | 2012-10-22 15:46:43 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-22 15:46:43 -0700 |
commit | 74261d847f64ccfeba0a7f08f6c59473a3b6647d (patch) | |
tree | c45542b51b18de26ef87373a127a2666e74cec22 /core/jni | |
parent | 5be59670c26edf27bfdfdf0430b535dda718bd9d (diff) | |
parent | 547e66531d521eb1eadac87edb0f79f8c2f1bbe0 (diff) | |
download | frameworks_base-74261d847f64ccfeba0a7f08f6c59473a3b6647d.zip frameworks_base-74261d847f64ccfeba0a7f08f6c59473a3b6647d.tar.gz frameworks_base-74261d847f64ccfeba0a7f08f6c59473a3b6647d.tar.bz2 |
Merge "Don't null the reference to Bitmap pixels until we're really ready" into jb-mr1-dev
Diffstat (limited to 'core/jni')
-rw-r--r-- | core/jni/android/graphics/Bitmap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index f485e03..63683b4 100644 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -261,14 +261,14 @@ static void Bitmap_destructor(JNIEnv* env, jobject, SkBitmap* bitmap) { delete bitmap;
}
-static void Bitmap_recycle(JNIEnv* env, jobject, SkBitmap* bitmap) {
+static jboolean Bitmap_recycle(JNIEnv* env, jobject, SkBitmap* bitmap) {
#ifdef USE_OPENGL_RENDERER
if (android::uirenderer::Caches::hasInstance()) {
- android::uirenderer::Caches::getInstance().resourceCache.recycle(bitmap);
- return;
+ return android::uirenderer::Caches::getInstance().resourceCache.recycle(bitmap);
}
#endif // USE_OPENGL_RENDERER
bitmap->setPixels(NULL, NULL);
+ return true;
}
// These must match the int values in Bitmap.java
@@ -665,7 +665,7 @@ static JNINativeMethod gBitmapMethods[] = { { "nativeCopy", "(IIZ)Landroid/graphics/Bitmap;",
(void*)Bitmap_copy },
{ "nativeDestructor", "(I)V", (void*)Bitmap_destructor },
- { "nativeRecycle", "(I)V", (void*)Bitmap_recycle },
+ { "nativeRecycle", "(I)Z", (void*)Bitmap_recycle },
{ "nativeCompress", "(IIILjava/io/OutputStream;[B)Z",
(void*)Bitmap_compress },
{ "nativeErase", "(II)V", (void*)Bitmap_erase },
|