| commit | 99c156cd9ff67119e20d4ebc851998d68492da05 | [log] [tgz] |
|---|---|---|
| author | Yu Shan Emily Lau <yslau@google.com> | Thu Sep 24 16:59:59 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 24 16:59:59 2009 -0700 |
| tree | 5d284102edc97ef5ef87d2ffaec0430ee263de56 | |
| parent | 63344cae94520d789dbe4002dcc3d6ef45d9a040 [diff] | |
| parent | 7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9 [diff] |
am 7d0bdfaf: Merge change 26948 into eclair Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp * commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9': Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java index ab8b311..0b96bae 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java
@@ -55,6 +55,7 @@ } // Generate a random number, sends it to the ping test player. + @Suppress @MediumTest public void testPing() throws Exception { mPlayer.setDataSource("test:invoke_mock_media_player.so?url=ping");