Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5eaf2ea authored by shailendra's avatar shailendra Committed by Android Git Automerger
Browse files

am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and... 

am 0d922ec9: Merge "Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)" into honeycomb-mr1

* commit '0d922ec9':
  Fix for testThumbnailForInvalidFilePath and testPropertiesForNonExsitingFile failed with HMI75B(4124235)
parents efb56934 0d922ec9

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaItemThumbnailTest.java

+3 −1
Original line number Diff line number Diff line
@@ -587,6 +587,8 @@ public class MediaItemThumbnailTest extends 
            imageItemFileName, 3000, renderingMode);

        } catch (IllegalArgumentException e) {

            flagForException = true;

        } catch (IOException e) {

            flagForException = true;

        }

        assertTrue(" Invalid File Path", flagForException);

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -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);

     }