Merge "nuke MediaPlayerFlakyNetworkTest" into jb-mr1-dev
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
index 21f2669..10a563c 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
@@ -63,7 +63,7 @@
releaseHttpServer();
super.tearDown();
}
-
+/* disable the whole tests until someone could fix it.
public void test_S0P0() throws Throwable {
doPlayStreams(0, 0);
}
@@ -91,7 +91,7 @@
public void test_S6P00002() throws Throwable {
doPlayStreams(6, 0.00002f);
}
-
+*/
private void doPlayStreams(int seed, float probability) throws Throwable {
Random random = new Random(seed);
createHttpServer(seed, probability);