commit d4fe797f08237bc33931f685b4e6d1e5530058ca
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 20 03:28:37 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 20 03:28:38 2017 +0000
tree b6abbe4d7b1034439a1ae3e8473eec8190a87d9b
parent f649c6f3a400684e46c6e2687e233eae57578a35
parent de5a0979ce1c8cc6b9341bbcccf49dbcf3d6bcf0

Merge "Fix cts crash in testStagefright_cve_2015_3836" into marshmallow-cts-dev

tests/tests/security/src/android/security/cts/StagefrightTest.java

diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index 5107f0e..80f31ca 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -535,7 +535,7 @@
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         try {
             retriever.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
-        } catch (IllegalArgumentException e) {
+        } catch (RuntimeException e) {
             // ignore
         }
         retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);