diff options
| author | 2010-08-20 03:54:21 -0700 | |
|---|---|---|
| committer | 2010-08-20 03:54:21 -0700 | |
| commit | dc2eabd10847d8e7f016fec5232d40b723ce2828 (patch) | |
| tree | d5a0b64fb52c258d12eb5f3800a1f710100c64ab | |
| parent | 271c1bfd60eaa20c3f37e685864d992e0770ac00 (diff) | |
| parent | 966803ab81f8e9bfefa502fcb533de023825a389 (diff) | |
Merge "Don't recycle native bitmap after the finalizer is called." into gingerbread
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 7ca374164096..00860ae375e7 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(); |