commit 98269b486ddaadba1b4295f2c3a1130aee044fe4
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 11 23:40:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 11 23:40:47 2018 +0000
tree 9c0cf83a6a79dffc987d16949d80f67afc0e809e
parent 0953d3cd90d4c5606d7a5abd30325afceda46818
parent 546cd05acd84067e5cdc2c54aee6c9b303920981

Merge "DO NOT MERGE: CTS test for Android Security b/62673179" into nougat-cts-dev

tests/tests/security/res/raw/bug_62673179_ts.mp4

diff --git a/tests/tests/security/res/raw/bug_62673179_ts.mp4 b/tests/tests/security/res/raw/bug_62673179_ts.mp4
new file mode 100755
index 0000000..f48583c
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_62673179_ts.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 75b4830..5fc463f 100755
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -249,6 +249,11 @@
         doStagefrightTest(R.raw.bug_25765591);
     }
 
+    @SecurityTest
+    public void testStagefright_bug_62673179() throws Exception {
+        doStagefrightTest(R.raw.bug_62673179_ts, (4 * 60 * 1000));
+    }
+
     public void testStagefright_cve_2015_3867() throws Exception {
         doStagefrightTest(R.raw.cve_2015_3867);
     }
@@ -372,9 +377,9 @@
             @Override
             public void run() {
                 try {
-                    doStagefrightTest(rid);
+                  doStagefrightTest(rid);
                 } catch (Exception e) {
-                    //unhandled exception
+                  fail(e.toString());
                 }
             }
         }, timeout);