diff options
| author | shailendra <shailendray@google.com> | 2011-03-18 11:02:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-18 11:02:35 -0700 |
| commit | a5eaf2eae0d11c45d9167f7fcadaafdeefad645c (patch) | |
| tree | 7de639131a1d37f3827c646496f128f2d23704c6 /media | |
| parent | efb56934efdc0aae38ce7264f2576326293846b6 (diff) | |
| parent | 0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776 (diff) | |
| download | frameworks_base-a5eaf2eae0d11c45d9167f7fcadaafdeefad645c.zip frameworks_base-a5eaf2eae0d11c45d9167f7fcadaafdeefad645c.tar.gz frameworks_base-a5eaf2eae0d11c45d9167f7fcadaafdeefad645c.tar.bz2 | |
am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1
* commit '0d922ec92dfe1d4adb6c66cdd2d3c16eb6b29776':
Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
Diffstat (limited to 'media')
2 files changed, 5 insertions, 1 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java index 895ca25..154f691 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java @@ -585,7 +585,9 @@ public class MediaItemThumbnailTest extends try{ final MediaImageItem mii = new MediaImageItem(mVideoEditor, "m1", imageItemFileName, 3000, renderingMode); - }catch (IllegalArgumentException e){ + } catch (IllegalArgumentException e) { + flagForException = true; + } catch (IOException e) { flagForException = true; } assertTrue(" Invalid File Path", flagForException); 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 3efa5b2..958bbb0 100755 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPropertiesTest.java @@ -513,6 +513,8 @@ public class MediaPropertiesTest extends MediaItem.RENDERING_MODE_BLACK_BORDER); } catch (IllegalArgumentException e) { flagForException = true; + } catch (IOException e) { + flagForException = true; } assertTrue("Media Properties for non exsisting file", flagForException); } |