Merge "Fix for issue 3370007 Overlay transparency in Java" into honeycomb

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

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;
+        }
     }
 }