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

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

am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable... 

am 15b02f04: Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo

Merge commit '15b02f04' into froyo-plus-aosp

* commit '15b02f04':
  Remove the checkStremingServer checking as it is unstable and introduce the flakiness.
parents 376722fc 15b02f04

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

+3 −3
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
    

    @MediumTest

    public void testPrepareAsyncReset() throws Exception {

      assertTrue(MediaFrameworkTest.checkStreamingServer());

      //assertTrue(MediaFrameworkTest.checkStreamingServer());

      boolean isReset = CodecTest.prepareAsyncReset(MediaNames.STREAM_MP3);

      assertTrue("PrepareAsync Reset", isReset);         

    }
@@ -472,7 +472,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
    

    @LargeTest

    public void testStreamPrepareAsyncCallback() throws Exception {

        assertTrue(MediaFrameworkTest.checkStreamingServer());

        //assertTrue(MediaFrameworkTest.checkStreamingServer());

        boolean onPrepareSuccess = 

            CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, false);

        assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess);
@@ -480,7 +480,7 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra 
    

    @LargeTest

    public void testStreamPrepareAsyncCallbackReset() throws Exception {

        assertTrue(MediaFrameworkTest.checkStreamingServer());

        //assertTrue(MediaFrameworkTest.checkStreamingServer());

        boolean onPrepareSuccess = 

            CodecTest.prepareAsyncCallback(MediaNames.STREAM_H264_480_360_1411k, true);

        assertTrue("StreamH264PrepareAsyncCallback", onPrepareSuccess);