commit 2a722effe4bfd15409b3dea38e68c1b29c0ee335
author rchanchl <quic_rchanchl@quicinc.com> Wed Jul 10 11:28:50 2019 +0530
committer Matt Fitzpatrick <mafitzpatrick@google.com> Fri Sep 13 14:31:33 2019 -0700
tree 93243c57ba1859a7348ae5dd17ed9224768587f1
parent 4065e8b1d0f45a3803da1a57c58411e56701e4c9

[RESTRICT AUTOMERGE] CTS test for Android Security b/132699388

Test: successful run of newly introduced CTS test case.

Bug: b/132699388
Change-Id: Icc2f668ed32641c771b25f20c37e0678c704e63d
(cherry picked from commit 5bbdba99f9e7b709f0642658dd965445d4f0a8e9)
(cherry picked from commit 9b390c77eef0b8f3b2906752889551a5161af99e)

tests/tests/security/res/raw/cve_2019_2322.mkv

diff --git a/tests/tests/security/res/raw/cve_2019_2322.mkv b/tests/tests/security/res/raw/cve_2019_2322.mkv
new file mode 100644
index 0000000..8431f98
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2019_2322.mkv
Binary files differ

tests/tests/security/src/android/security/cts/StagefrightTest.java

diff --git a/tests/tests/security/src/android/security/cts/StagefrightTest.java b/tests/tests/security/src/android/security/cts/StagefrightTest.java
index 2e3e2b2..c3d81ac 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -1029,6 +1029,11 @@
         doStagefrightTest(R.raw.cve_2019_2327);
     }
 
+    @SecurityTest(minPatchLevel = "2019-07")
+    public void testStagefright_cve_2019_2322() throws Exception {
+        doStagefrightTest(R.raw.cve_2019_2322);
+    }
+
     @SecurityTest(minPatchLevel = "2018-03")
     public void testStagefright_cve_2017_17773() throws Exception {
         doStagefrightTest(R.raw.cve_2017_17773);