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

Commit 2fe9130f authored by Hong Teng's avatar Hong Teng Committed by Android Git Automerger
Browse files

am 2be608f8: am 6db79c35: Merge "Fix for issue 5712743 video editor functional... 

am 2be608f8: am 6db79c35: 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 an

* commit '2be608f8':
  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.
parents 9c316f3c 2be608f8

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

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








        blockTillPreviewCompletes.acquire();

        blockTillPreviewCompletes.acquire();

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

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

                    final int height = MediaProperties.HEIGHT_480;

                    final int height = MediaProperties.HEIGHT_480;

                    final int bitrate = MediaProperties.BITRATE_512K;

                    final int bitrate = MediaProperties.BITRATE_512K;