commit 6ac77d8dc083e0dffb9492f97f0be03f4d394a20
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Feb 05 01:45:40 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 05 01:45:40 2020 +0000
tree d7ee89ffe8291690031a5655db87b1c6d2e5fc98
parent 643c99d53bcc7bc03872326ba2f83f6b0b3fdcbb
parent 0e59e1013f480419b40afb2ecad36fa32ef72e56

Merge "Revert "CTS test for Android Security b/137879783"" into oc-dev

tests/tests/security/res/raw/cve_2019_10488.avi

diff --git a/tests/tests/security/res/raw/cve_2019_10488.avi b/tests/tests/security/res/raw/cve_2019_10488.avi
deleted file mode 100644
index 9230fe4..0000000
--- a/tests/tests/security/res/raw/cve_2019_10488.avi
+++ /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 931ed36..22527bb 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -1087,11 +1087,6 @@
         doStagefrightTest(R.raw.cve_2019_10541);
     }
 
-    @SecurityTest(minPatchLevel = "2019-09")
-    public void testStagefright_cve_2019_10488() throws Exception {
-        doStagefrightTest(R.raw.cve_2019_10488);
-    }
-
     @SecurityTest(minPatchLevel = "2019-08")
     public void testStagefright_cve_2019_10489() throws Exception {
         doStagefrightTest(R.raw.cve_2019_10489);