summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorshailendra <shailendray@google.com>2011-03-22 11:50:15 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-22 11:50:15 -0700
commitb819dcd49ddd4be8f102c99576bb42cd088caf1a (patch)
tree76c57bda2aeed9fbeedd1e007009368775686a70 /media
parent012401774f4aac29ad8cf8e32f36c4a521842767 (diff)
parent8483073ec21b5e2332deaad914eba1d087b1d1e3 (diff)
downloadframeworks_base-b819dcd49ddd4be8f102c99576bb42cd088caf1a.zip
frameworks_base-b819dcd49ddd4be8f102c99576bb42cd088caf1a.tar.gz
frameworks_base-b819dcd49ddd4be8f102c99576bb42cd088caf1a.tar.bz2
am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3': Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
Diffstat (limited to 'media')
-rwxr-xr-xmedia/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java15
1 files changed, 11 insertions, 4 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
index 958bbb0..59783e5 100755
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java
@@ -30,6 +30,7 @@ import android.test.ActivityInstrumentationTestCase;
import android.test.suitebuilder.annotation.LargeTest;
import com.android.mediaframeworktest.MediaFrameworkTest;
import com.android.mediaframeworktest.VideoEditorHelper;
+import com.android.mediaframeworktest.MediaProfileReader;
public class MediaPropertiesTest extends
ActivityInstrumentationTestCase<MediaFrameworkTest> {
@@ -465,11 +466,17 @@ public class MediaPropertiesTest extends
final String videoItemFilename = INPUT_FILE_PATH +
"WMV_V7_640x480_15fps_512Kbps_wma_V9_44khz_48Kbps_s_1_30.wmv";
boolean flagForException = false;
- try {
- new MediaVideoItem(mVideoEditor, "m1", videoItemFilename,
- MediaItem.RENDERING_MODE_BLACK_BORDER);
- } catch (IllegalArgumentException e) {
+ if (MediaProfileReader.getWMVEnable() == false) {
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",
flagForException);