commit 407881802396a442964660d703a18586320b1012
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 29 21:00:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 29 21:00:32 2018 +0000
tree 6e3e79917c0b87413972c93b4128ce2fbe8fc5ce
parent 2686fd7da445e749983cac398e623b1728814c17
parent 4ba6c684506b50698b6adf6f4e83d0d1e1ae7143

Merge changes from topic "am-5d94ddc8-4437-49fd-9932-8c5b453727c7" into cw-f-dev

* changes:
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4 am: c2d61425c6 am: 83b82ec94b am: 717386dbe4
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4 am: c2d61425c6 am: 83b82ec94b
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4 am: c2d61425c6
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72 am: 269333a4f4
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0 am: acb3421e72
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776 am: 556b7b7da0
  [automerger] CTS test for Android Security b/72507266 b/28165659 am: 1e7b502776
  CTS test for Android Security b/72507266 b/28165659

tests/tests/security/res/raw/cve_2016_3742_b_28165659.mp4

diff --git a/tests/tests/security/res/raw/cve_2016_3742_b_28165659.mp4 b/tests/tests/security/res/raw/cve_2016_3742_b_28165659.mp4
new file mode 100644
index 0000000..3b5003d
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2016_3742_b_28165659.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 050a4a3..c941d2f 100755
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -325,6 +325,11 @@
     }
 
     @SecurityTest
+    public void testStagefright_cve_2016_3742_b_28165659() throws Exception {
+        doStagefrightTest(R.raw.cve_2016_3742_b_28165659);
+    }
+
+    @SecurityTest
     public void testStagefright_bug_35039946() throws Exception {
         doStagefrightTestRawBlob(R.raw.bug_35039946_hevc, "video/hevc", 320, 420);
     }