diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-03-30 09:26:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-30 09:26:23 +0000 |
| commit | cf8538c7695b445bb1a7d2c1990e94e12cc99184 (patch) | |
| tree | 52a4dc4ca0498ba8c8735ebb4ef3e77b404281de | |
| parent | 1393522107f1520a7a9914be5cb00de88c9a53eb (diff) | |
| parent | 354867cdfebee903f01446890401e8f53f923885 (diff) | |
| download | cts-cf8538c7695b445bb1a7d2c1990e94e12cc99184.tar.gz | |
Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/130024844" into pi-dev
| -rw-r--r-- | tests/tests/security/res/raw/cve_2019_2107_framelen.mp4 | 6 | ||||
| -rw-r--r-- | tests/tests/security/res/raw/cve_2019_2107_hevc.mp4 | bin | 0 -> 3488 bytes | |||
| -rw-r--r-- | tests/tests/security/src/android/security/cts/StagefrightTest.java | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/tests/tests/security/res/raw/cve_2019_2107_framelen.mp4 b/tests/tests/security/res/raw/cve_2019_2107_framelen.mp4 new file mode 100644 index 00000000000..b64071290be --- /dev/null +++ b/tests/tests/security/res/raw/cve_2019_2107_framelen.mp4 @@ -0,0 +1,6 @@ +943 +243 +636 +979 +421 +266 diff --git a/tests/tests/security/res/raw/cve_2019_2107_hevc.mp4 b/tests/tests/security/res/raw/cve_2019_2107_hevc.mp4 Binary files differnew file mode 100644 index 00000000000..a6665024bd8 --- /dev/null +++ b/tests/tests/security/res/raw/cve_2019_2107_hevc.mp4 diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java index 64f255ae1e8..b16d99fff90 100644 --- a/tests/tests/security/src/android/security/cts/StagefrightTest.java +++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java @@ -1170,6 +1170,14 @@ public class StagefrightTest { ***********************************************************/ @Test + @SecurityTest(minPatchLevel = "2019-07") + public void testStagefright_cve_2019_2107() throws Exception { + int[] frameSizes = getFrameSizes(R.raw.cve_2019_2107_framelen); + doStagefrightTestRawBlob(R.raw.cve_2019_2107_hevc, "video/hevc", 1920, + 1080, frameSizes); + } + + @Test @SecurityTest(minPatchLevel = "2019-04") public void testStagefright_cve_2019_2245() throws Exception { doStagefrightTest(R.raw.cve_2019_2245); |