Snap for 9531772 from 2dc59d94234ace4a80f5fe33d4b2351435b50be9 to tm-qpr3-releaseandroid-13.0.0_r83android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-release

Change-Id: I0424ee8538a445424f4b49180556ffe3024b02f6

2 files changed, 4 insertions, 0 deletions

diff --git a/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java b/platform/src/test/java/org/conscrypt/metrics/MetricsTest.java
index a1288fc4..25844696 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 static org.junit.Assert.assertEquals;
 
 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 @@ public class MetricsTest {
 
     // 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 739d684f..2f053fe0 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 static org.junit.Assert.assertEquals;
 
 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 @@ public class MetricsTest {
 
     // 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();