Merge "Add thread cleanup test"
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index c14728e..3b1674e 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -25,7 +25,8 @@
LOCAL_PACKAGE_NAME := CtsVerifier
-LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni libcameraanalyzer
+LOCAL_JNI_SHARED_LIBRARIES := libctsverifier_jni \
+ #libcameraanalyzer # Needed for the disabled CameraAnalyzer tests
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index e266d44..d3068bd 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -302,7 +302,7 @@
<meta-data android:name="test_required_features" android:value="android.hardware.camera.any"/>
</activity>
-<!-- Experimental
+<!-- Experimental. If re-enabling, libcameraanalyzer must be included in the build
<activity android:name=".camera.analyzer.CameraAnalyzerActivity"
android:label="@string/camera_analyzer"
android:screenOrientation="landscape">
diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java b/tests/tests/media/src/android/media/cts/MediaPlayerFlakyNetworkTest.java
index 10a563c..8063cbb 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);
@@ -309,8 +309,7 @@
try {
float random = mRandom.nextFloat();
if (random < probability) {
- // TODO restore 1000 to 6000 after fixing 6770717
- int sleepTimeMs = 1000 + mRandom.nextInt(500);
+ int sleepTimeMs = 1000 + mRandom.nextInt(5000);
Thread.sleep(sleepTimeMs);
flush();
} else if (random < probability * 100) {
diff --git a/tools/utils/buildCts.py b/tools/utils/buildCts.py
index 38f1ef4..5d846df 100755
--- a/tools/utils/buildCts.py
+++ b/tools/utils/buildCts.py
@@ -115,6 +115,12 @@
plan = tools.TestPlan(packages)
plan.Exclude(ptsPattern)
plan.Exclude('android\.performance.*')
+ plan.Exclude('android\.media\.cts\.StreamingMediaPlayerTest.*')
+ # Test plan to not include media streaming tests
+ self.__WritePlan(plan, 'CTS-No-Media-Stream')
+
+ plan = tools.TestPlan(packages)
+ plan.Exclude('android\.performance.*')
self.__WritePlan(plan, 'SDK')
plan.Exclude(r'android\.tests\.sigtest')