diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2010-12-06 10:14:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-06 10:14:16 -0800 |
| commit | 28bec9ebceba9df6e7400d18c1e6b8a04430114e (patch) | |
| tree | 367057b1f18c72aa7b8fe79d76efb04e92d43f8a | |
| parent | 384977fceaba842fd4a5f64111a2266c9e61dba5 (diff) | |
| parent | e8f317d32ccf09f613f91da75965532a05dd4bca (diff) | |
| download | frameworks_base-28bec9ebceba9df6e7400d18c1e6b8a04430114e.zip frameworks_base-28bec9ebceba9df6e7400d18c1e6b8a04430114e.tar.gz frameworks_base-28bec9ebceba9df6e7400d18c1e6b8a04430114e.tar.bz2 | |
Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)"
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java index 2332657..ce6db68 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java @@ -253,7 +253,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram } //Format: QVGA h263 - @LargeTest + @Suppress public void testQVGAH263() throws Exception { boolean videoRecordedResult = false; recordVideo(15, 320, 240, MediaRecorder.VideoEncoder.H263, @@ -263,7 +263,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram } //Format: SQVGA h263 - @LargeTest + @Suppress public void testSQVGAH263() throws Exception { boolean videoRecordedResult = false; recordVideo(15, 240, 160, MediaRecorder.VideoEncoder.H263, @@ -341,7 +341,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram assertTrue("HVGAMP4", videoRecordedResult); } - @LargeTest + @Suppress public void testQVGAMP4() throws Exception { boolean videoRecordedResult = false; recordVideo(15, 320, 240, MediaRecorder.VideoEncoder.MPEG_4_SP, @@ -350,7 +350,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram assertTrue("QVGAMP4", videoRecordedResult); } - @LargeTest + @Suppress public void testSQVGAMP4() throws Exception { boolean videoRecordedResult = false; recordVideo(15, 240, 160, MediaRecorder.VideoEncoder.MPEG_4_SP, |