summaryrefslogtreecommitdiffstats
path: root/media/tests
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-11-20 12:03:34 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-20 12:03:34 -0800
commit507322ca5c5b678714314ae87e27d07c89c40785 (patch)
treeea1b206b84797933fd8b8ef9a8ad79c7e98b3dde /media/tests
parent0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336 (diff)
parent9ed314cefb5ec711dfcb5527a2a0a6b87a643c24 (diff)
downloadframeworks_base-507322ca5c5b678714314ae87e27d07c89c40785.zip
frameworks_base-507322ca5c5b678714314ae87e27d07c89c40785.tar.gz
frameworks_base-507322ca5c5b678714314ae87e27d07c89c40785.tar.bz2
am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2 * commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24': Add the checking for mediaplayer stress test.
Diffstat (limited to 'media/tests')
-rw-r--r--media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java2
1 files changed, 2 insertions, 0 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 b476e01..0132ae8 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
@@ -86,6 +86,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
} catch (Exception e) {
Log.v(TAG, e.toString());
+ assertTrue("testStressHWDecoderRelease", false);
}
}
@@ -139,6 +140,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi
} catch (Exception e) {
Log.v(TAG, e.toString());
+ assertTrue("testStressGetCurrentPosition", false);
}
}
}