summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYu Shan Emily Lau <yslau@google.com>2009-11-20 12:13:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-20 12:13:26 -0800
commitea1862bbf459e5af0222d9bb49741b45ab10791a (patch)
treecb11295b29be0d3083bf309800c78c9a25fae7fd
parent11678ebe25b27736990534902ce508508ff47212 (diff)
parentc6bb089df15c25948757f6dbd9007fc0d49bb568 (diff)
downloadframeworks_base-ea1862bbf459e5af0222d9bb49741b45ab10791a.zip
frameworks_base-ea1862bbf459e5af0222d9bb49741b45ab10791a.tar.gz
frameworks_base-ea1862bbf459e5af0222d9bb49741b45ab10791a.tar.bz2
am c6bb089d: am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair
Merge commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568' * commit 'c6bb089df15c25948757f6dbd9007fc0d49bb568': Add the checking for mediaplayer stress test.
-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);
}
}
}