[automerger] CTS test for Android Security b/33933140 am: a105077efd am: ddac62f8a2 am: 58d9fab204 am: 5d96628180 am: b06866f88f am: c699d96ba5 am: 80420843bd am: 60c64c3ca8 am: 9ede4e7d39
Change-Id: Id01a1a9422b2941ddc08b084581ab4a27da28256
diff --git a/tests/tests/security/res/raw/bug_33933140_avc.mp4 b/tests/tests/security/res/raw/bug_33933140_avc.mp4
new file mode 100644
index 0000000..8c0ab9a
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_33933140_avc.mp4
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_33933140_framelen.mp4 b/tests/tests/security/res/raw/bug_33933140_framelen.mp4
new file mode 100644
index 0000000..1c27219
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_33933140_framelen.mp4
@@ -0,0 +1,17 @@
+20721
+5397
+5736
+7236
+7145
+7735
+8228
+8537
+8829
+9208
+19423
+8484
+8609
+8779
+9817
+9306
+34770
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index ed49f4b..41740b9 100755
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -388,6 +388,12 @@
}
@SecurityTest
+ public void testStagefright_bug_33933140() throws Exception {
+ int[] frameSizes = getFrameSizes(R.raw.bug_33933140_framelen);
+ doStagefrightTestRawBlob(R.raw.bug_33933140_avc, "video/avc", 320, 240, frameSizes);
+ }
+
+ @SecurityTest
public void testStagefright_cve_2017_0599() throws Exception {
doStagefrightTest(R.raw.cve_2017_0599);
}