commit 48051dc305217749b814b39b89774ed9b52bf99e
author Anuj Joshi <anuj.joshi@ittiam.com> Tue Mar 23 04:40:35 2021 +0000
committer Vikas Prasad <vikasprasad@google.com> Tue Mar 23 04:40:35 2021 +0000
tree 2b909bbabe27935ea0121d4399bca03d47f8c764
parent 7d69fb4113b690f55c1622c8bf8a8eed45fdd8ad

[RESTRICT AUTOMERGE] Updated CTS test for Android Security b/172655291

Bug: 172655291
Bug: 177454666
Test: Ran the new testcase on android-9.0.0_r39 with/without patch

Change-Id: Icf4354e65f2893b4865ec93aabafbdc6c020279b
(cherry picked from commit 5df716bd7a2603b86c4d85bdc780fdede32ae1b6)

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

diff --git a/tests/tests/security/src/android/security/cts/CVE_2021_0394.java b/tests/tests/security/src/android/security/cts/CVE_2021_0394.java
index 325e7af..513c962 100644
--- a/tests/tests/security/src/android/security/cts/CVE_2021_0394.java
+++ b/tests/tests/security/src/android/security/cts/CVE_2021_0394.java
@@ -16,11 +16,15 @@
 
 package android.security.cts;
 
+import android.platform.test.annotations.RequiresDevice;
 import android.platform.test.annotations.SecurityTest;
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.runner.RunWith;
 import org.junit.Test;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertFalse;
 
-public class CVE_2021_0394 extends TestCase {
+@RunWith(AndroidJUnit4.class)
+public class CVE_2021_0394 {
     static {
         System.loadLibrary("ctssecurity_jni");
     }
@@ -30,6 +34,9 @@
      */
     @SecurityTest(minPatchLevel = "2021-03")
     @Test
+    @RequiresDevice
+    // emulators always have checkJNI enabled which causes the test
+    // to abort the VM while passing invalid input to NewStringUTF
     public void testPocCVE_2021_0394() throws Exception {
         assertFalse(poc());
     }