diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2009-11-20 12:08:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-20 12:08:54 -0800 |
| commit | c6bb089df15c25948757f6dbd9007fc0d49bb568 (patch) | |
| tree | e5af30ab884d1c8aa9f43b5268157638bb9829f2 /media/tests | |
| parent | 60f6b6f86f3a8f12f0260c55f7cb40b8f72da941 (diff) | |
| parent | 507322ca5c5b678714314ae87e27d07c89c40785 (diff) | |
| download | frameworks_base-c6bb089df15c25948757f6dbd9007fc0d49bb568.zip frameworks_base-c6bb089df15c25948757f6dbd9007fc0d49bb568.tar.gz frameworks_base-c6bb089df15c25948757f6dbd9007fc0d49bb568.tar.bz2 | |
am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp
* commit '507322ca5c5b678714314ae87e27d07c89c40785':
Add the checking for mediaplayer stress test.
Diffstat (limited to 'media/tests')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java | 2 |
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); } } } |