diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2009-11-20 12:04:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-20 12:04:17 -0800 |
| commit | d66b63c2660fb4c97df8b8c0bdbacf08c4d86633 (patch) | |
| tree | 557279a5be5e783d47a21cc8b41debbfbdcc77b0 /media | |
| parent | d6b457e18b1ecd71a31de43feb231d7d0718fe5d (diff) | |
| parent | 9ed314cefb5ec711dfcb5527a2a0a6b87a643c24 (diff) | |
| download | frameworks_base-d66b63c2660fb4c97df8b8c0bdbacf08c4d86633.zip frameworks_base-d66b63c2660fb4c97df8b8c0bdbacf08c4d86633.tar.gz frameworks_base-d66b63c2660fb4c97df8b8c0bdbacf08c4d86633.tar.bz2 | |
am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-plus-aosp
* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.
Diffstat (limited to 'media')
| -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); } } } |