commit 2ecb2a1a3600291099f064d9e0165228fbe2026d
author Ayushi Khopkar <ayushi.khopkar@ittiam.com> Fri Dec 27 20:05:32 2019 +0530
committer Stacie Mashnitskaya <mashnitskaya@google.com> Mon Sep 21 10:16:42 2020 -0700
tree 0f4ce46145c4315ccd7153ba89a4e84defbd3c0c
parent 4e35c7aed1d83df8611e313c81ac5c43c0432bfc

CTS test for Android Security b/140322595

Bug: 140322595
Bug: 143369226
Test: Ran the new testcase on android-10.0.0_r1 to test with/without patch

Change-Id: I1e21ab461c94a5e17fb6f6914b38cebcd77da1d2

tests/tests/security/res/raw/cve_2019_2222_framelen.mp4

diff --git a/tests/tests/security/res/raw/cve_2019_2222_framelen.mp4 b/tests/tests/security/res/raw/cve_2019_2222_framelen.mp4
new file mode 100644
index 0000000..a4bc980
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2019_2222_framelen.mp4
@@ -0,0 +1,8 @@
+35
+28
+12
+6
+10
+31
+8
+130

tests/tests/security/res/raw/cve_2019_2222_hevc.mp4

diff --git a/tests/tests/security/res/raw/cve_2019_2222_hevc.mp4 b/tests/tests/security/res/raw/cve_2019_2222_hevc.mp4
new file mode 100644
index 0000000..26b8007
--- /dev/null
+++ b/tests/tests/security/res/raw/cve_2019_2222_hevc.mp4
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 c670edc..54f0832 100644
--- a/tests/tests/security/src/android/security/cts/StagefrightTest.java
+++ b/tests/tests/security/src/android/security/cts/StagefrightTest.java
@@ -1580,6 +1580,18 @@
         doStagefrightTest(R.raw.cve_2016_3879, new CrashUtils.Config().checkMinAddress(false));
     }
 
+    /***********************************************************
+     to prevent merge conflicts, add P tests below this comment,
+     before any existing test methods
+     ***********************************************************/
+
+    @Test
+    @SecurityTest(minPatchLevel = "2019-12")
+    public void testStagefright_cve_2019_2222() throws Exception {
+        int[] frameSizes = getFrameSizes(R.raw.cve_2019_2222_framelen);
+        doStagefrightTestRawBlob(R.raw.cve_2019_2222_hevc, "video/hevc", 320, 240, frameSizes);
+    }
+
     private void doStagefrightTest(final int rid) throws Exception {
         doStagefrightTest(rid, null);
     }