summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-04-03 23:14:22 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-04-03 23:14:22 +0000
commit7a719b39ca1cd63acce3473fb3c485c01ee55fc6 (patch)
tree708b7b2e4f88235468c05c8690d89efa3e1a0bd9
parentc913cf2733e79f2aac66959061c18c20c37353bb (diff)
parentadfa6614ecfced0cc17e9623daa7eda1cf8ce317 (diff)
downloadcts-7a719b39ca1cd63acce3473fb3c485c01ee55fc6.tar.gz
Snap for 6362707 from adfa6614ecfced0cc17e9623daa7eda1cf8ce317 to qt-qpr3-release
Change-Id: Iec2dc9b4f4e35a5141151cc3fd5758a7229c9d43
-rw-r--r--hostsidetests/securitybulletin/src/android/security/cts/Poc18_11.java10
-rw-r--r--tests/tests/security/res/raw/bug_110435401.midbin12 -> 0 bytes
-rw-r--r--tests/tests/security/res/raw/bug_26366256.midibin565820 -> 0 bytes
-rw-r--r--tests/tests/security/res/raw/bug_68664359.mid1
-rw-r--r--tests/tests/security/src/android/security/cts/StagefrightTest.java15
5 files changed, 0 insertions, 26 deletions
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/Poc18_11.java b/hostsidetests/securitybulletin/src/android/security/cts/Poc18_11.java
index 9699b179284..0abe1bba7c0 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/Poc18_11.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/Poc18_11.java
@@ -27,16 +27,6 @@ import static org.junit.Assert.*;
public class Poc18_11 extends SecurityTestCase {
/**
- * b/111330641
- */
- @Test
- @SecurityTest(minPatchLevel = "2018-11")
- public void testPocCVE_2018_9525() throws Exception {
- assertTrue(AdbUtils.runCommandGetExitCode(
- "pm dump com.android.settings | grep SliceBroadcastReceiver", getDevice()) != 0);
- }
-
- /**
* b/113027383
*/
@Test
diff --git a/tests/tests/security/res/raw/bug_110435401.mid b/tests/tests/security/res/raw/bug_110435401.mid
deleted file mode 100644
index 184ab1f5040..00000000000
--- a/tests/tests/security/res/raw/bug_110435401.mid
+++ /dev/null
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_26366256.midi b/tests/tests/security/res/raw/bug_26366256.midi
deleted file mode 100644
index 5114d92a852..00000000000
--- a/tests/tests/security/res/raw/bug_26366256.midi
+++ /dev/null
Binary files differ
diff --git a/tests/tests/security/res/raw/bug_68664359.mid b/tests/tests/security/res/raw/bug_68664359.mid
deleted file mode 100644
index f816d826f44..00000000000
--- a/tests/tests/security/res/raw/bug_68664359.mid
+++ /dev/null
@@ -1 +0,0 @@
-DK:@~kkkkk \ No newline at end of file
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index be1a2418151..ecc983cfec1 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -259,11 +259,6 @@ public class StagefrightTest extends InstrumentationTestCase {
doStagefrightTest(R.raw.cve_2016_6766);
}
- @SecurityTest(minPatchLevel = "2016-04")
- public void testStagefright_bug_26366256() throws Exception {
- doStagefrightTest(R.raw.bug_26366256);
- }
-
@SecurityTest(minPatchLevel = "2017-02")
public void testStagefright_cve_2016_2429_b_27211885() throws Exception {
doStagefrightTest(R.raw.cve_2016_2429_b_27211885,
@@ -962,16 +957,6 @@ public class StagefrightTest extends InstrumentationTestCase {
doStagefrightTest(R.raw.bug_37430213);
}
- @SecurityTest(minPatchLevel = "2018-11")
- public void testStagefright_bug_68664359() throws Exception {
- doStagefrightTest(R.raw.bug_68664359, 60000);
- }
-
- @SecurityTest(minPatchLevel = "2018-11")
- public void testStagefright_bug_110435401() throws Exception {
- doStagefrightTest(R.raw.bug_110435401, 60000);
- }
-
@SecurityTest(minPatchLevel = "2017-03")
public void testStagefright_cve_2017_0474() throws Exception {
doStagefrightTest(R.raw.cve_2017_0474, 120000);