diff options
| author | Chih-Chung Chang <chihchung@google.com> | 2010-08-22 04:31:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-22 04:31:38 -0700 |
| commit | d51a933b94ea0f4fc780fb09ef6cd0059e3506c5 (patch) | |
| tree | beb3863d8b499bdf2018227edec66c0be13dab55 /graphics/java/android | |
| parent | b65444df013020000a0d60491e9cf14c950c9500 (diff) | |
| parent | 72ecb00a89b7a49eadb9c3bb880102eef97c8eb6 (diff) | |
| download | frameworks_base-d51a933b94ea0f4fc780fb09ef6cd0059e3506c5.zip frameworks_base-d51a933b94ea0f4fc780fb09ef6cd0059e3506c5.tar.gz frameworks_base-d51a933b94ea0f4fc780fb09ef6cd0059e3506c5.tar.bz2 | |
am 72ecb00a: Merge "Revert "Don\'t recycle native bitmap after the finalizer is called."" into gingerbread
Merge commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6' into gingerbread-plus-aosp
* commit '72ecb00a89b7a49eadb9c3bb880102eef97c8eb6':
Revert "Don't recycle native bitmap after the finalizer is called."
Diffstat (limited to 'graphics/java/android')
| -rw-r--r-- | graphics/java/android/graphics/Bitmap.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 00860ae..7ca3741 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -1002,7 +1002,6 @@ public final class Bitmap implements Parcelable { @Override protected void finalize() throws Throwable { try { - mRecycled = true; nativeDestructor(mNativeBitmap); } finally { super.finalize(); |