summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-11-06 23:47:26 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-11-06 23:47:26 +0000
commit8778b14377e03209b6bd7211e0352d41477f25d8 (patch)
treefe39e22a99394960b7131faa68592dd240528d71
parent189826f46911678df3127bf8a655e67aa14cc464 (diff)
parente2ced040b0cf9abd207b6341382066841e45eba5 (diff)
downloadcts-8778b14377e03209b6bd7211e0352d41477f25d8.tar.gz
Merge "StagefrightTest unselectTrack exception handling" into oreo-cts-dev
-rw-r--r--tests/tests/security/src/android/security/cts/StagefrightTest.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index c2d16355af1..db020d4aa52 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -919,7 +919,11 @@ public class StagefrightTest extends InstrumentationTestCase {
codec.release();
}
}
- ex.unselectTrack(t);
+ try {
+ ex.unselectTrack(t);
+ } catch (IllegalArgumentException e) {
+ // since we're just cleaning up, we don't care if it fails
+ }
}
ex.release();
String cve = rname.replace("_", "-").toUpperCase();