Merge changes from topic "am-55b18ef7-2d60-400d-b48d-5fe16d33f7ac" into nyc-dr1-dev
* changes:
[automerger] CTS test for Android Security b/23285192 am: f28c6f29d2
CTS test for Android Security b/23285192
diff --git a/tests/tests/security/res/raw/bug_23285192.mp3 b/tests/tests/security/res/raw/bug_23285192.mp3
new file mode 100644
index 0000000..b86e4d8
--- /dev/null
+++ b/tests/tests/security/res/raw/bug_23285192.mp3
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 5a1d6d7..0db5f74 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -785,6 +785,11 @@
doStagefrightTestRawBlob(R.raw.bug_73552574_avc, "video/avc", 320, 240, frameSizes);
}
+ @SecurityTest(minPatchLevel = "2015-09")
+ public void testStagefright_bug_23285192() throws Exception {
+ doStagefrightTest(R.raw.bug_23285192);
+ }
+
@SecurityTest(minPatchLevel = "2016-03")
public void testStagefright_bug_25928803() throws Exception {
doStagefrightTest(R.raw.bug_25928803);