Merge tag 'android-13.0.0_r52' into int/13/fp3
Android 13.0.0 Release 52 (TQ3A.230605.012)
* tag 'android-13.0.0_r52':
[DO NOT MERGE] Ignore MetricsTest on CTS 12.
[DO NOT MERGE] Ignore MetricsTest on CTS 13.
[DO NOT MERGE] Ignore MetricsTest on CTS 12.
Make SSLSocketTest agnostic about whether TLSv1 is supported.
[DO NOT MERGE] CTS 10: Work around blocklist class name change.
[DO NOT MERGE] CTS 10: Work around ConscryptHostnameVerifier changes.
[DO NOT MERGE] CTS 10: Add key size for XDH.
[DO NOT MERGE] CTS 10: Remove invalid count check of unwrap calls.
[DO NOT MERGE] CTS 11: Work around blocklist class name change.
[DO NOT MERGE] CTS 11: Work around ConscryptHostnameVerifier changed.
[DO NOT MERGE] CTS 11: Add key size for XDH.
[DO NOT MERGE] CTS 11: Remove invalid count check of unwrap calls.
Make testing of handshake session cipher suite consistent.
CipherTest should skip unknown algorithms
Clean up EXPECTED_BLOCK_SIZE
Cherry-pick test changes to android10-tests-dev
Change-Id: Iebe5b3456cef29fa7354d992cc68ecc1dec01e35
diff --git a/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java b/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
index a1288fc..2584469 100644
--- a/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
+++ b/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
@@ -20,6 +20,7 @@
import android.util.StatsEvent;
import org.conscrypt.TestUtils;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -30,6 +31,7 @@
// Tests that ReflexiveEvent produces the same event as framework's.
@Test
+ @Ignore // Ignore on CTS 12 only: b/259508875
public void test_reflexiveEvent() throws Exception {
TestUtils.assumeStatsLogAvailable();
diff --git a/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java b/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java
index 739d684..2f053fe 100644
--- a/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java
+++ b/repackaged/platform/src/test/java/com/android/org/conscrypt/metrics/MetricsTest.java
@@ -21,6 +21,7 @@
import android.util.StatsEvent;
import com.android.org.conscrypt.TestUtils;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -34,6 +35,7 @@
// Tests that ReflexiveEvent produces the same event as framework's.
@Test
+ @Ignore // Ignore on CTS 12 only: b/259508875
public void test_reflexiveEvent() throws Exception {
TestUtils.assumeStatsLogAvailable();