commit 0b6b4674a12d67d8ac86c0dd239ecdf79a06f3ef
author Pawin Vongmasa <pawin@google.com> Tue Oct 03 16:44:11 2017 -0700
committer Nikoli Cartagena <dargeren@google.com> Mon Nov 13 23:55:16 2017 -0800
tree 7c133d10ebbeb0ce1ca01867354b4542a24ad3b9
parent 52c2c68bfef6f30d67f0983fe6b2ff21e278d999

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
(cherry picked from commit 675334ee39d44c47a012c769cd1586e5bdae91cb)

tests/tests/security/res/raw/cve_2017_0852_b_62815506.hevc

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

tests/tests/security/src/android/security/cts/StagefrightTest.java

diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index 70e14d4..67600ec 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -206,6 +206,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
@@ -349,11 +365,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);