commit 3d0626e0a0bfb9949d41ca28f616652a2c1ca9cc
author nbasudkar <nivedita.basudkar@harman.corp-partner.google.com> Fri Jul 06 17:52:05 2018 +0530
committer Pradeep Chenthati <pchenthati@google.com> Thu Jul 19 19:02:44 2018 +0000
tree 65a17ee201604c228eaa17350cf8eb2dd709284b
parent e5cb27c7365b9f256b96a6dfc431bb00a3ea3908

[RESTRICT AUTOMERGE]: CTS test for Android Security b/66734153 b/79773616

Test: successful run of newly introduced CTS test case.
Bug: 66734153
Bug: 79773616

Change-Id: I17df902764ff240520c8d893cd90968acbd8cadb
Signed-off-by: nbasudkar <nivedita.basudkar@harman.corp-partner.google.com>
(cherry picked from commit b6e6c7e22cb44b7480767dee0348be16902ba68a)

tests/tests/security/res/raw/cve_2017_18155.mp4

diff --git a/tests/tests/security/res/raw/cve_2017_18155.mp4 b/tests/tests/security/res/raw/cve_2017_18155.mp4
new file mode 100644
index 0000000..5765dbb
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2017_18155.mp4
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 6e34d40..868219e 100755
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -889,6 +889,11 @@
         doStagefrightTest(R.raw.cve_2016_6699);
     }
 
+    @SecurityTest
+    public void testStagefright_cve_2017_18155() throws Exception {
+        doStagefrightTest(R.raw.cve_2017_18155);
+    }
+
     private void doStagefrightTest(final int rid) throws Exception {
         doStagefrightTestMediaPlayer(rid);
         doStagefrightTestMediaCodec(rid);