am c4f5b712: am 270cbcc1: Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb

* commit 'c4f5b712049a5891bc2d1a87031134f3fe0acb03':
  Fix for issue 3370007 Overlay transparency in Java

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 1244b8e..f438be8 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 834fc66..0a928fe 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;
+        }
     }
 }