Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91c52f7 authored by Yu Shan Emily Lau's avatar Yu Shan Emily Lau Committed by Android Git Automerger
Browse files

am 8c937a17: Merge change 22379 into donut 

Merge commit '8c937a17' into eclair

* commit '8c937a17':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
parents 4e9718d6 8c937a17

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

+7 −0
Original line number Diff line number Diff line
@@ -434,6 +434,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);