SnapdragonCamera: Fix memory leak when updating thumbnails.

Fix a memory leak with jpeg data buffers saved for
updating thumbnails. Ensure that all references are freed
and released when exiting.

CRs-Fixed: 1054441
Change-Id: Idc79f51f0e70b0b3e39d614ff3dd7f5d1f85aaad

1 files changed, 13 insertions, 2 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index e7c55dfab..4a56e447e 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -761,8 +761,8 @@ public class CameraActivity extends Activity
     }
 
     private class UpdateThumbnailTask extends AsyncTask<Void, Void, Bitmap> {
-        private final byte[] mJpegData;
-        private final boolean mCheckOrientation;
+        private byte[] mJpegData;
+        private boolean mCheckOrientation;
 
         public UpdateThumbnailTask(final byte[] jpegData, boolean checkOrientation) {
             mJpegData = jpegData;
@@ -805,6 +805,17 @@ public class CameraActivity extends Activity
             } else {
                 updateThumbnail(bitmap);
             }
+
+            mJpegData = null;
+        }
+
+        @Override
+        protected void onCancelled(Bitmap bitmap) {
+            if(bitmap != null)
+                bitmap.recycle();
+
+            bitmap = null;
+            mJpegData = null;
         }
 
         private Bitmap decodeImageCenter(final String path) {