Merge "[RESTRICT AUTOMERGE] CTS test for Android Security b/33552073" into nyc-dev
diff --git a/hostsidetests/securitybulletin/res/bug_33552073.h264 b/hostsidetests/securitybulletin/res/bug_33552073.h264
new file mode 100644
index 0000000..ad4cd5a
--- /dev/null
+++ b/hostsidetests/securitybulletin/res/bug_33552073.h264
Binary files differ
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
index acd8644..ae876a7 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/TestMediaCodec.java
@@ -76,6 +76,15 @@
below this comment, before any existing test methods
***********************************************************/
+ @SecurityTest(minPatchLevel = "2017-03")
+ public void testPocBug_33552073() throws Exception {
+ String inputFiles[] = {"bug_33552073.h264"};
+ runAvcDecodeMemTest(inputFiles,
+ "--input " + TMP_FILE_PATH
+ + "bug_33552073.h264 --output /dev/null",
+ getDevice(), null);
+ }
+
@SecurityTest
public void testPocBug_33621215() throws Exception {
String inputFiles[] = {"bug_33621215.h264"};