Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa71047e authored by YuanQY's avatar YuanQY Committed by Ricardo Cerqueira
Browse files

Fix resource leak: When call MediaMetadataRetriever.setDataSource or... 

Fix resource leak: When call MediaMetadataRetriever.setDataSource or getFrameAtTime should ensure call release in finally to avoid resource leak
                   Patch set 2: Remove unnecessary white spaces

Change-Id: I49a7f2fb99dc8b9560e7c17421125356e45a87ac
parent 28a46cac

media/java/android/media/videoeditor/VideoEditorImpl.java

+14 −4
Original line number Diff line number Diff line
@@ -1834,10 +1834,20 @@ public class VideoEditorImpl implements VideoEditor { 
            String filename = mI.getFilename();

            if (mI instanceof MediaVideoItem) {

                MediaMetadataRetriever retriever = new MediaMetadataRetriever();

                Bitmap bitmap = null;

                try {

                    retriever.setDataSource(filename);

                Bitmap bitmap = retriever.getFrameAtTime();

                    bitmap = retriever.getFrameAtTime();

                } catch (RuntimeException ex) {

                    // Ignore failures while cleaning up.

                } finally {

                    try {

                        retriever.release();

                retriever = null;

                    } catch (RuntimeException ex) {

                        // Ignore failures while cleaning up.

                    }

                }



                if (bitmap == null) {

                    String msg = "Thumbnail extraction from " +

                                    filename + " failed";