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

Commit 6db79c35 authored by Hong Teng's avatar Hong Teng Committed by Android (Google) Code Review
Browse files

Merge "Fix for issue 5712743 video editor functional test :... 

Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character.  And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
parents f3364080 96bea6a5

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java

+1 −1
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ public class VideoEditorPreviewTest extends 




        blockTillPreviewCompletes.acquire();

                    final String fileName = mVideoEditor.getPath() + "\test.3gp";

                    final String fileName = mVideoEditor.getPath() + "/test.3gp";

                    final int height = MediaProperties.HEIGHT_480;

                    final int bitrate = MediaProperties.BITRATE_512K;