diff options
| author | Hong Teng <hongteng@google.com> | 2011-12-06 16:59:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 16:59:45 -0800 |
| commit | 2fe9130f227b31e3d24987f442c3374f2299d9f5 (patch) | |
| tree | 127399ffe03b7d961b45dcb5ade2cb22df2d08f4 /media | |
| parent | 9c316f3c6ac785fd27be97a119dfe8f1303a8ed4 (diff) | |
| parent | 2be608f88cd469b40a472551f22a9d40903beede (diff) | |
| download | frameworks_base-2fe9130f227b31e3d24987f442c3374f2299d9f5.zip frameworks_base-2fe9130f227b31e3d24987f442c3374f2299d9f5.tar.gz frameworks_base-2fe9130f227b31e3d24987f442c3374f2299d9f5.tar.bz2 | |
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 '2be608f88cd469b40a472551f22a9d40903beede':
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.
Diffstat (limited to 'media')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java index 3c08138..4181903 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java @@ -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; |