commit 2d0bb8ef878743d69de875732a12dbf64bd6fb29
author Matt Fitzpatrick <mafitzpatrick@google.com> Mon Mar 30 14:58:08 2020 -0700
committer Christopher Dombroski <cdombroski@google.com> Thu Apr 02 20:56:35 2020 -0700
tree aa01a0324fb2801488b3681439c07ebbcf4f0b72
parent d5d4e62e44b3aed06c1298b387b98f3fda7478cc

Revert "sonivox: fix hang caused by bad meta-event (cts)"

This reverts commit 7144f3ff11b13432954752f4cd471f418f0e793f.

Bug: 69804002
Bug: 68953854
Bug: 68664359
Bug: 151764674

Test: cts-tradefed run cts --class android.security.cts.StagefrightTest --method testStagefright_bug_68953854
Change-Id: I5be99cfe1a9effc24b9c17db6e8763fb70c876ce
Merged-In: I5be99cfe1a9effc24b9c17db6e8763fb70c876ce

tests/tests/security/res/raw/bug_68953854.mid

diff --git a/tests/tests/security/res/raw/bug_68953854.mid b/tests/tests/security/res/raw/bug_68953854.mid
deleted file mode 100644
index ce9432d6..0000000
--- a/tests/tests/security/res/raw/bug_68953854.mid
+++ /dev/null
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 0f362ec..7c4c29df 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -327,11 +327,6 @@
         doStagefrightTest(R.raw.cve_2016_3920, new CrashUtils.Config().checkMinAddress(false));
     }
 
-    @SecurityTest(minPatchLevel = "2018-06")
-    public void testStagefright_bug_68953854() throws Exception {
-        doStagefrightTest(R.raw.bug_68953854, 1 * 60 * 1000);
-    }
-
     @SecurityTest(minPatchLevel = "2017-09")
     public void testStagefright_bug_38448381() throws Exception {
         doStagefrightTest(R.raw.bug_38448381);