| commit | 9969e2640f0341b22148e3ac41f3a5c681d99257 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Apr 11 22:46:17 2018 +0000 |
| committer | Android Build Merger (Role) <noreply-android-build-merger@google.com> | Wed Apr 11 22:46:17 2018 +0000 |
| tree | 1e41d5a25152391f99d159c44f85b5c3b7298f69 | |
| parent | ac592118ed0ea0c7fac8dfc833cebf291421dae6 [diff] | |
| parent | cc9c63c864cae14a9a0f0a7b6998309d4415bb0b [diff] |
[automerger] Merge commit 'adb631a793802bebc0587e280fa2b21cfa18dd8e' into cp2 BUG:35267372 BUG:69120821 am: cc9c63c864 Change-Id: I7d2550c3574988a02276054ffb6f2088ff6ec595
diff --git a/tests/tests/security/res/raw/bug_24157524.mp4 b/tests/tests/security/res/raw/bug_24157524.mp4 new file mode 100644 index 0000000..f2da774 --- /dev/null +++ b/tests/tests/security/res/raw/bug_24157524.mp4 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 462c937..97c3b5c 100755 --- a/tests/tests/security/src/android/security/cts/StagefrightTest.java +++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -536,6 +536,11 @@ } @SecurityTest + public void testStagefright_bug_24157524() throws Exception { + doStagefrightTest(R.raw.bug_24157524); + } + + @SecurityTest public void testStagefright_cve_2015_3871() throws Exception { doStagefrightTest(R.raw.cve_2015_3871); }