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

Commit 3f790d87 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 27011 into eclair 

* changes:
  Added the checking for the wma in the memory test.
parents fdf53a46 a56e6531

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/performance/MediaPlayerPerformance.java

+17 −15
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import java.io.FileWriter; 
import java.io.BufferedWriter;



import android.media.MediaMetadataRetriever;

import com.android.mediaframeworktest.MediaProfileReader;



/**

 * Junit / Instrumentation - performance measurement for media player and
@@ -384,8 +385,8 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
    @LargeTest

    public void testWMVVideoPlaybackMemoryUsage() throws Exception {

        boolean memoryResult = false;

        if (MediaProfileReader.getWMVEnable()){

            mStartPid = getMediaserverPid();



            File wmvMemoryOut = new File(MEDIA_MEMORY_OUTPUT);

            Writer output = new BufferedWriter(new FileWriter(wmvMemoryOut, true));

            output.write("WMV video playback only\n");
@@ -402,6 +403,7 @@ public class MediaPlayerPerformance extends ActivityInstrumentationTestCase<Medi 
            output.close();

            assertTrue("wmv playback memory test", memoryResult);

        }

    }



    // Test case 4: Capture the memory usage after every 20 video only recorded

    @LargeTest