diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2009-08-24 10:14:25 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-24 10:14:25 -0700 |
| commit | b91c52f77387a95b4ae554b369644e0f41e401ea (patch) | |
| tree | 12505a0e84fca870551809a23f6fc6235ee2e7c0 /media/tests/MediaFrameworkTest | |
| parent | 4e9718d6ae3433a3f78fddf158a15701101ba781 (diff) | |
| parent | 8c937a17667704ee9ba60663f4c4b76f3c3a0f78 (diff) | |
| download | frameworks_base-b91c52f77387a95b4ae554b369644e0f41e401ea.zip frameworks_base-b91c52f77387a95b4ae554b369644e0f41e401ea.tar.gz frameworks_base-b91c52f77387a95b4ae554b369644e0f41e401ea.tar.bz2 | |
am 8c937a17: Merge change 22379 into donut
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair
* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Diffstat (limited to 'media/tests/MediaFrameworkTest')
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java index ea42f53..dcb8c43 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java @@ -435,6 +435,13 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra @LargeTest public void testLocalMp3PrepareAsyncCallback() throws Exception { boolean onPrepareSuccess = + CodecTest.prepareAsyncCallback(MediaNames.MP3CBR, false); + assertTrue("LocalMp3prepareAsyncCallback", onPrepareSuccess); + } + + @LargeTest + public void testLocalH263AMRPrepareAsyncCallback() throws Exception { + boolean onPrepareSuccess = CodecTest.prepareAsyncCallback(MediaNames.VIDEO_H263_AMR, false); assertTrue("LocalMp3prepareAsyncCallback", onPrepareSuccess); } |