| commit | 236e53bacf5ed7a43aa4a2bde217b2879dba7e3e | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Fri Jun 16 20:58:05 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 16 20:58:05 2017 +0000 |
| tree | e84db043d1e42e9865db528c30e84cdf0e2a9267 | |
| parent | b646b371c2242913ea92c0c1986088ba855281f3 [diff] | |
| parent | 311cb1ee7d135f27ab879d0ff88701223ab124d2 [diff] |
Merge "Test for bug 38342499" into klp-dev am: a30a033188 am: c952191151 am: 4e6cedc51c am: 6e787106a2 am: 311cb1ee7d Change-Id: I2cdd43c6017df83a662a4eda7622dcde03db363e
diff --git a/tests/tests/security/res/raw/bug_38342499.mid b/tests/tests/security/res/raw/bug_38342499.mid new file mode 100644 index 0000000..4d2e282 --- /dev/null +++ b/tests/tests/security/res/raw/bug_38342499.mid 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 ab2dcf3..715a6b9 100644 --- a/tests/tests/security/src/android/security/cts/StagefrightTest.java +++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -73,6 +73,11 @@ ***********************************************************/ @SecurityTest + public void testStagefright_bug_38342499() throws Exception { + doStagefrightTest(R.raw.bug_38342499); + } + + @SecurityTest public void testStagefright_bug_23270724() throws Exception { doStagefrightTest(R.raw.bug_23270724_1); doStagefrightTest(R.raw.bug_23270724_2);