Snap for 10782510 from ef94246894137b7f474829f2ac1f47be623b0c4f to android12-tests-releaseandroid-vts-12.0_r11android-vts-12.0_r10android-cts-12.0_r11android-cts-12.0_r10

Change-Id: I46804f9e28e919fb0a414dee43fa635ee8ed153e

2 files changed, 6 insertions, 0 deletions

diff --git a/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java b/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java
index 439b554d..8f4f896e 100644
--- a/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java
+++ b/common/src/test/java/org/conscrypt/javax/crypto/CipherTest.java
@@ -70,6 +70,7 @@ import javax.crypto.spec.PBEParameterSpec;
 import javax.crypto.spec.PSource;
 import javax.crypto.spec.SecretKeySpec;
 import libcore.junit.util.EnableDeprecatedBouncyCastleAlgorithmsRule;
+import libcore.test.annotation.NonCts;
 import org.bouncycastle.asn1.x509.KeyUsage;
 import org.conscrypt.Conscrypt;
 import org.conscrypt.TestUtils;
@@ -4645,6 +4646,8 @@ public final class CipherTest {
      * TODO(27995180): consider whether we keep this compatibility. Consider whether we only allow
      * if an IV is passed in the parameters.
      */
+    @NonCts(bug = 287231726, reason = "The test asserts buggy or non-breaking "
+            + "behaviors, but the behavior has been fixed in the future ART module version.")
     @Test
     public void test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV() throws Exception {
         Assume.assumeNotNull(Security.getProvider("BC"));
diff --git a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java
index a418d672..0a762d22 100644
--- a/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java
+++ b/repackaged/common/src/test/java/com/android/org/conscrypt/javax/crypto/CipherTest.java
@@ -75,6 +75,7 @@ import javax.crypto.spec.PBEParameterSpec;
 import javax.crypto.spec.PSource;
 import javax.crypto.spec.SecretKeySpec;
 import libcore.junit.util.EnableDeprecatedBouncyCastleAlgorithmsRule;
+import libcore.test.annotation.NonCts;
 import org.bouncycastle.asn1.x509.KeyUsage;
 import org.junit.Assume;
 import org.junit.BeforeClass;
@@ -4641,6 +4642,8 @@ public final class CipherTest {
      * TODO(27995180): consider whether we keep this compatibility. Consider whether we only allow
      * if an IV is passed in the parameters.
      */
+    @NonCts(bug = 287231726, reason = "The test asserts buggy or non-breaking "
+            + "behaviors, but the behavior has been fixed in the future ART module version.")
     @Test
     public void test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV() throws Exception {
         Assume.assumeNotNull(Security.getProvider("BC"));