commit 6ad450940a020457a3f2637cbcd53b4f9a0ea754
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 16 19:21:56 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 16 19:21:56 2017 +0000
tree 219471598a50dae15326321a1085fea1ab9e5bfc
parent a53136300183309f1b91297dce614050d0bcdbcd
parent e8a48fd4fdcc0fc6980a87403bfe10563ec6aaae

Merge "DO NOT MERGE Add test for bug 62187433" into lollipop-mr1-cts-dev

tests/tests/security/res/raw/bug_62187433.mp4

diff --git a/tests/tests/security/res/raw/bug_62187433.mp4 b/tests/tests/security/res/raw/bug_62187433.mp4
new file mode 100644
index 0000000..058d0f4
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_62187433.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 ed4f950..32d6578 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -69,6 +69,10 @@
      before any existing test methods
      ***********************************************************/
 
+    public void testStagefright_bug_62187433() throws Exception {
+        doStagefrightTest(R.raw.bug_62187433);
+    }
+
     public void testStagefrightANR_bug_62673844() throws Exception {
         doStagefrightTestANR(R.raw.bug_62673844);
     }