diff options
| author | James Dong <jdong@google.com> | 2010-11-15 08:13:30 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-15 08:13:30 -0800 |
| commit | 98d50a0be8a61fa1d093136b57bc5712be795c2b (patch) | |
| tree | b38bddd7d7d848303d424ea771f400594056da8f | |
| parent | 797fe921324e873073f969f0a769a208d9244121 (diff) | |
| parent | a76e7efde89424712ab2bddba2f8dc1472c2f203 (diff) | |
| download | frameworks_base-98d50a0be8a61fa1d093136b57bc5712be795c2b.zip frameworks_base-98d50a0be8a61fa1d093136b57bc5712be795c2b.tar.gz frameworks_base-98d50a0be8a61fa1d093136b57bc5712be795c2b.tar.bz2 | |
Merge "Disable flaky streaming server check"
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java index 0132ae8..95b7386 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java @@ -64,7 +64,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi mSurfaceHolder = MediaFrameworkTest.mSurfaceView.getHolder(); try { - assertTrue(MediaFrameworkTest.checkStreamingServer()); + //assertTrue(MediaFrameworkTest.checkStreamingServer()); for (int i = 0; i < NUMBER_OF_STRESS_LOOPS; i++) { MediaPlayer mp = new MediaPlayer(); mp.setDataSource(MediaNames.STREAM_H264_480_360_1411k); |