Merge "Insert the 2 seconds before test start to workaround the race conditon...

import com.android.mediaframeworktest.functional.CodecTest;

import android.content.Context;

import android.test.ActivityInstrumentationTestCase;

import android.test.ActivityInstrumentationTestCase2;

import android.util.Log;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;

/**

 * Junit / Instrumentation test case for the media player api

 */

public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFrameworkTest> {

public class MediaPlayerApiTest extends  ActivityInstrumentationTestCase2<MediaFrameworkTest> {

    private boolean duratoinWithinTolerence = false;

    private String TAG = "MediaPlayerApiTest";

    private boolean isWMAEnable = false;

    }

    protected void setUp() throws Exception {

       //Insert a 2 second before launching the test activity. This is

       //the workaround for the race condition of requesting the updated surface.

       Thread.sleep(2000);

       getActivity();

       super.setUp();

    }

    public boolean verifyDuration(int duration, int expectedDuration){