summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2017-10-20 00:46:15 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-20 00:46:15 +0000
commit28429ebf1818dd8e4d5317747cedeb3e338db63c (patch)
treebe9489999ff7a9dd9da1e0b35b0500c15c9fac4b
parent1b4ebadeb4ee7473d2c50ec903ba91707a3922b9 (diff)
parent0d5217c98b5537beed61fd05812832e79afafe16 (diff)
downloadcts-28429ebf1818dd8e4d5317747cedeb3e338db63c.tar.gz
Merge "Fix build" into mnc-dev am: af1e462b57 am: 54e3654d2d am: 1627c7272f am: 809ce83ef9 am: d4b0ab7481 am: 57fcac5b40 am: 31f0655eb4 am: 582dd4db23 am: 65b6b2531b
am: 0d5217c98b Change-Id: I4305aa4b23c91c1469d1ae8f501efefcbdd725ff
-rw-r--r--tests/tests/security/src/android/security/cts/StagefrightTest.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index 7eb6e4ac073..4e4830470e1 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -887,11 +887,6 @@ public class StagefrightTest extends InstrumentationTestCase {
doStagefrightTestRawBlob(R.raw.bug_37930177_hevc, "video/hevc", 320, 240);
}
- @SecurityTest
- public void testCve_2017_0762() throws Exception {
- doStagefrightTestRawBlob(R.raw.cve_2017_0762, "video/hevc", 320, 240);
- }
-
private void runWithTimeout(Runnable runner, int timeout) {
Thread t = new Thread(runner);
t.start();