| commit | 1d31a21094f894d927c1f5b2dde42ec4bb0dcefa | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Jun 02 03:20:35 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 02 03:20:35 2017 +0000 |
| tree | 6cb053de995cd5d922ce01ec8c885cbafd91f4f2 | |
| parent | d6f6eb39af1c1e54de27c56c795afc954d7c812e [diff] | |
| parent | 2193b1e156b3f11b7ff94556725dabf01e857b55 [diff] |
Merge "Revert "Add test for security bug 32873375"" into mnc-dev am: a1b717d513 am: 3e748479ab am: 2193b1e156 Change-Id: Iea2bf71a7476de876c7afb977953bba19c366319
diff --git a/tests/tests/security/res/raw/bug_32873375.mp4 b/tests/tests/security/res/raw/bug_32873375.mp4 deleted file mode 100644 index 71e9c7b..0000000 --- a/tests/tests/security/res/raw/bug_32873375.mp4 +++ /dev/null Binary files differ
diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java index bfb67c1..95023a2 100644 --- a/tests/tests/security/src/android/security/cts/StagefrightTest.java +++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -183,11 +183,6 @@ } @SecurityTest - public void testStagefright_bug_32873375() throws Exception { - doStagefrightTest(R.raw.bug_32873375); - } - - @SecurityTest public void testStagefright_bug_26366256() throws Exception { doStagefrightTest(R.raw.bug_26366256); }