[automerger] CTS test for Android Security b/33818500 am: bd6ec9c818 am: 9741538696 am: 7ffd6d9539 am: 126985b1eb am: 502414043b am: 945f842964 am: 34726c7253 am: 8a87d42a42 am: 59a6ec179a
Change-Id: I7ff61b871bcc216f5ed2900e50ccb3468d68f95a
diff --git a/tests/tests/security/res/raw/bug_33818500_avc.mp4 b/tests/tests/security/res/raw/bug_33818500_avc.mp4
new file mode 100644
index 0000000..56fdc2e
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_33818500_avc.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_33818500_framelen.mp4 b/tests/tests/security/res/raw/bug_33818500_framelen.mp4
new file mode 100644
index 0000000..9656d56
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_33818500_framelen.mp4
@@ -0,0 +1,10 @@
+2393
+681
+276
+124
+270
+0
+821
+127
+810
+154
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index f460b47..59f9fdd 100755
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -412,6 +412,12 @@
}
@SecurityTest
+ public void testBug_33818500() throws Exception {
+ int[] frameSizes = getFrameSizes(R.raw.bug_33818500_framelen);
+ doStagefrightTestRawBlob(R.raw.bug_33818500_avc, "video/avc", 64, 32, frameSizes);
+ }
+
+ @SecurityTest
public void testStagefright_cve_2017_0599() throws Exception {
doStagefrightTest(R.raw.cve_2017_0599);
}