| commit | f4ed87f1730570714126302310b3fe16ef4131f3 | [log] [tgz] |
|---|---|---|
| author | Cody Ebert <codyebert@google.com> | Fri Feb 23 00:32:41 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Feb 23 00:32:41 2018 +0000 |
| tree | 9a991ad7b2758a984aae78284f27318e83c7e9b4 | |
| parent | cc8b2f97677f628c155aca0681bbf4241b4c6097 [diff] | |
| parent | 5f6a8850fc570781a404b919dd78eb0101973fd6 [diff] |
Merge changes from topic "am-7fb27bea-2be9-4741-8b5c-fc4520164a51" into oc-dev am: 77237d809f am: 5f6a8850fc Change-Id: I57da401f40ef864814935e143d0c5406ab5b6558
diff --git a/tests/tests/security/res/raw/cve_2016_6764.mp4 b/tests/tests/security/res/raw/cve_2016_6764.mp4 new file mode 100644 index 0000000..46c1214 --- /dev/null +++ b/tests/tests/security/res/raw/cve_2016_6764.mp4 Binary files differ
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java index 893ed8a..37a58c7 100644 --- a/tests/tests/security/src/android/security/cts/StagefrightTest.java +++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -523,6 +523,11 @@ ***********************************************************/ @SecurityTest + public void testStagefright_cve_2016_6764() throws Exception { + doStagefrightTest(R.raw.cve_2016_6764); + } + + @SecurityTest public void testStagefright_cve_2017_13214() throws Exception { doStagefrightTest(R.raw.cve_2017_13214); }