RESTRICT AUTOMERGE Add CTS test for cve_2017_0852_b_62815506
Test: make cts -j123 && cts-tradefed run cts \
-m CtsSecurityTestCases \
-t android.security.cts.StagefrightTest#\
testStagefright_cve_2017_0852_b_62815506
Bug: 62815506
Change-Id: I890272906df43b4abb7ba84b10899644a157fabb
diff --git a/tests/tests/security/res/raw/cve_2017_0852_b_62815506.hevc b/tests/tests/security/res/raw/cve_2017_0852_b_62815506.hevc
new file mode 100644
index 0000000..37fe4f4
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2017_0852_b_62815506.hevc
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 91398f3..e7918ac 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -225,6 +225,22 @@
doStagefrightTest(R.raw.cve_2016_2429_b_27211885);
}
+ @SecurityTest
+ public void testStagefright_bug_34031018() throws Exception {
+ doStagefrightTest(R.raw.bug_34031018_32bit);
+ doStagefrightTest(R.raw.bug_34031018_64bit);
+ }
+
+ /***********************************************************
+ to prevent merge conflicts, add L tests below this comment,
+ before any existing test methods
+ ***********************************************************/
+
+ @SecurityTest
+ public void testStagefright_cve_2017_0852_b_62815506() throws Exception {
+ doStagefrightTest(R.raw.cve_2017_0852_b_62815506);
+ }
+
/***********************************************************
to prevent merge conflicts, add M tests below this comment,
before any existing test methods
@@ -369,11 +385,6 @@
doStagefrightTest(R.raw.bug_35467107);
}
- public void testStagefright_bug_34031018() throws Exception {
- doStagefrightTest(R.raw.bug_34031018_32bit);
- doStagefrightTest(R.raw.bug_34031018_64bit);
- }
-
private void doStagefrightTest(final int rid) throws Exception {
doStagefrightTestMediaPlayer(rid);
doStagefrightTestMediaCodec(rid);