diff options
| author | Yu Shan Emily Lau <yslau@google.com> | 2009-08-25 10:42:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-08-25 10:42:02 -0700 |
| commit | 523018f1828884e96b1265f3e347410280577945 (patch) | |
| tree | bc663706abc23092fb416c6dfe517d011e6a36bf | |
| parent | 91ba1c3f9d000928a4ba12d45d609b1c2e7066e7 (diff) | |
| parent | b56de7474d93e634f77be58a794fbd1b0e68f6a8 (diff) | |
| download | frameworks_base-523018f1828884e96b1265f3e347410280577945.zip frameworks_base-523018f1828884e96b1265f3e347410280577945.tar.gz frameworks_base-523018f1828884e96b1265f3e347410280577945.tar.bz2 | |
am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair
* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java | 7 |
1 files changed, 0 insertions, 7 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 dcb8c43..ea42f53 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java @@ -435,13 +435,6 @@ 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); } |