From 73f376cf6446c607b6f0355ad8282dd47608346d Mon Sep 17 00:00:00 2001
From: Santosh Madhava <smadhava@google.com>
Date: Thu, 27 Jan 2011 14:03:34 -0800
Subject: Fix for issue 3370007 Overlay transparency in Java

Change-Id: I68be6f56ad58672a771485a028fc0cd8a0514e8a
---
 media/java/android/media/videoeditor/MediaArtistNativeHelper.java | 1 -
 media/java/android/media/videoeditor/OverlayFrame.java            | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
index 1244b8e5264e..f438be8d27ee 100644
--- a/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
+++ b/media/java/android/media/videoeditor/MediaArtistNativeHelper.java
@@ -2105,7 +2105,6 @@ class MediaArtistNativeHelper {
                 //For image get the scaled height. Aspect ratio would remain the same
                 mediaItemHeight = ((MediaImageItem)overlay.getMediaItem()).getScaledHeight();
                 aspectRatio = overlay.getMediaItem().getAspectRatio();
-                effectSettings.framingResize = false; //since the image can be of odd size.
             }
         } else {
             aspectRatio = overlay.getMediaItem().getAspectRatio();
diff --git a/media/java/android/media/videoeditor/OverlayFrame.java b/media/java/android/media/videoeditor/OverlayFrame.java
index 834fc6689bc4..0a928fea5d70 100755
--- a/media/java/android/media/videoeditor/OverlayFrame.java
+++ b/media/java/android/media/videoeditor/OverlayFrame.java
@@ -235,7 +235,7 @@ public class OverlayFrame extends Overlay {
          mOFWidth = width;
      }
     /**
-     * Delete the overlay file
+     * Delete the overlay files
      */
     void invalidate() {
         if (mFilename != null) {
@@ -244,5 +244,9 @@ public class OverlayFrame extends Overlay {
             mBitmap.recycle();
             mBitmap = null;
         }
+        if (mBitmapFileName != null) {
+            new File(mBitmapFileName).delete();
+            mBitmapFileName = null;
+        }
     }
 }
-- 
cgit v1.2.3-59-g8ed1b