diff options
Diffstat (limited to 'media/tests')
2 files changed, 4 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java index fa0986a..e66e560 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CameraTest.java @@ -226,7 +226,8 @@ public class CameraTest extends ActivityInstrumentationTestCase<MediaFrameworkTe * Test case 1: Take a picture and verify all the callback * functions are called properly. */ - @LargeTest + // TODO: add this back to LargeTest once bug 2141755 is fixed + // @LargeTest public void testTakePicture() throws Exception { synchronized (lock) { initializeMessageLooper(); diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java index d2809c1..ddf5e0b 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaMimeTest.java @@ -83,7 +83,8 @@ public class MediaMimeTest extends ActivityInstrumentationTestCase2<MediaFramewo assertMediaPlaybackActivityHandles("audio/*"); } - @MediumTest + // TODO: temporarily remove from medium suite because it hangs whole suite + // @MediumTest // Checks the MediaPlaybackActivity handles application/itunes. Some servers // set the Content-type header to application/iTunes (with capital T, but // the download manager downcasts it) for their MP3 podcasts. This is non |