summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorHong Teng <hongteng@google.com>2011-12-06 11:51:47 -0800
committerHong Teng <hongteng@google.com>2011-12-06 11:51:47 -0800
commit96bea6a5e9a362c21fbdb98f0e67212de7dffdc6 (patch)
tree53cb79e1f43d63f3ad118112fea23e81a18a5f39 /media
parent613ed4c69a53e6ffb1f104c7d45a0c6dd41c8eb0 (diff)
downloadframeworks_base-96bea6a5e9a362c21fbdb98f0e67212de7dffdc6.zip
frameworks_base-96bea6a5e9a362c21fbdb98f0e67212de7dffdc6.tar.gz
frameworks_base-96bea6a5e9a362c21fbdb98f0e67212de7dffdc6.tar.bz2
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. Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
Diffstat (limited to 'media')
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/videoeditor/VideoEditorPreviewTest.java2
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;