From 966803ab81f8e9bfefa502fcb533de023825a389 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Fri, 20 Aug 2010 17:10:49 +0800
Subject: Don't recycle native bitmap after the finalizer is called.

If an object A's finalizer calls Bitmap B's recycle() when B's
finalizer is already called, we will have trouble because the
native bitmap is already freed in the finalizer.

Change-Id: Ic0be8ed75fb3aacee9ce6e3d9908178a55151eb9
---
 graphics/java/android/graphics/Bitmap.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'graphics')

diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 7ca3741..00860ae 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -1002,6 +1002,7 @@ public final class Bitmap implements Parcelable {
     @Override
     protected void finalize() throws Throwable {
         try {
+            mRecycled = true;
             nativeDestructor(mNativeBitmap);
         } finally {
             super.finalize();
-- 
cgit v1.1