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

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();