diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-08-20 03:56:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 03:56:33 -0700 |
| commit | 3a59ddc67c6ad33c01d36338603586f90d94e71b (patch) | |
| tree | a0a35c418eb82bb429469cdf38b1f4e4ca2188b6 | |
| parent | caaf7fe3a407c764f643585d050c16f5fb56503c (diff) | |
| parent | dc2eabd10847d8e7f016fec5232d40b723ce2828 (diff) | |
| download | frameworks_base-3a59ddc67c6ad33c01d36338603586f90d94e71b.zip frameworks_base-3a59ddc67c6ad33c01d36338603586f90d94e71b.tar.gz frameworks_base-3a59ddc67c6ad33c01d36338603586f90d94e71b.tar.bz2 | |
am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is called." into gingerbread
Merge commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828' into gingerbread-plus-aosp
* commit 'dc2eabd10847d8e7f016fec5232d40b723ce2828':
Don't recycle native bitmap after the finalizer is called.
| -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 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(); |