Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1

Browse Source 
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
This commit is contained in:
shailendra
2011-03-22 11:50:15 -07:00
committed by Android Git Automerger
parent 012401774f 8483073ec2
commit b819dcd49d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
View File

@@ -30,6 +30,7 @@ import android.test.ActivityInstrumentationTestCase;
import android.test.suitebuilder.annotation.LargeTest; import android.test.suitebuilder.annotation.LargeTest;
import com.android.mediaframeworktest.MediaFrameworkTest; import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.VideoEditorHelper; import com.android.mediaframeworktest.VideoEditorHelper;
import com.android.mediaframeworktest.MediaProfileReader;
public class MediaPropertiesTest extends public class MediaPropertiesTest extends
ActivityInstrumentationTestCase<MediaFrameworkTest> { ActivityInstrumentationTestCase<MediaFrameworkTest> {
@@ -465,11 +466,17 @@ public class MediaPropertiesTest extends
final String videoItemFilename = INPUT_FILE_PATH + final String videoItemFilename = INPUT_FILE_PATH +
"WMV_V7_640x480_15fps_512Kbps_wma_V9_44khz_48Kbps_s_1_30.wmv"; "WMV_V7_640x480_15fps_512Kbps_wma_V9_44khz_48Kbps_s_1_30.wmv";
boolean flagForException = false; boolean flagForException = false;
try { if (MediaProfileReader.getWMVEnable() == false) {
new MediaVideoItem(mVideoEditor, "m1", videoItemFilename,
MediaItem.RENDERING_MODE_BLACK_BORDER);
} catch (IllegalArgumentException e) {
flagForException = true; flagForException = true;
} else {
try {
new MediaVideoItem(mVideoEditor, "m1", videoItemFilename,
MediaItem.RENDERING_MODE_BLACK_BORDER);
} catch (IllegalArgumentException e) {
flagForException = true;
} catch (IOException e) {
flagForException = true;
}
} }
assertTrue("Media Properties for a WMV File -- Unsupported file type", assertTrue("Media Properties for a WMV File -- Unsupported file type",
flagForException); flagForException);