[automerger] CTS test for Android Security b/34097915 am: 08b60dcb05 am: f480c4a63e am: 7a9fcc0576 am: 7e63f14ea6 am: 49f381c41a am: 6989162d26 am: 019604b89f am: c85017349f am: 99862fac0f
Change-Id: I61e5491453023665b97d31833a893ef26a678423
diff --git a/tests/tests/security/res/raw/bug_34097915_avc.mp4 b/tests/tests/security/res/raw/bug_34097915_avc.mp4
new file mode 100644
index 0000000..f7d2d11
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_34097915_avc.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 41740b9..527ecc7 100755
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -394,6 +394,12 @@
}
@SecurityTest
+ public void testStagefright_bug_34097915() throws Exception {
+ int[] frameSizes = {4140, 593, 0, 15495};
+ doStagefrightTestRawBlob(R.raw.bug_34097915_avc, "video/avc", 320, 240, frameSizes);
+ }
+
+ @SecurityTest
public void testStagefright_cve_2017_0599() throws Exception {
doStagefrightTest(R.raw.cve_2017_0599);
}