diff options
author | shailendra <shailendray@google.com> | 2011-03-22 11:48:12 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-22 11:48:12 -0700 |
commit | 8483073ec21b5e2332deaad914eba1d087b1d1e3 (patch) | |
tree | 471203d9be55724906d13833a3e7d46cb6a56d07 /media/tests/MediaFrameworkTest | |
parent | 3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed (diff) | |
parent | d0c281328903189b42585948054cfb14a1385d50 (diff) | |
download | frameworks_base-8483073ec21b5e2332deaad914eba1d087b1d1e3.zip frameworks_base-8483073ec21b5e2332deaad914eba1d087b1d1e3.tar.gz frameworks_base-8483073ec21b5e2332deaad914eba1d087b1d1e3.tar.bz2 |
Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1
Diffstat (limited to 'media/tests/MediaFrameworkTest')
-rwxr-xr-x | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java | 15 |
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); |