Merge Android 14

Bug: 298295554
Merged-In: Id5ba8250839ac44b1515305431400328a7683744
Change-Id: Ib8c813c32a45ad489a2223e10e42baba8a8b3039

1 files changed, 4 insertions, 0 deletions

diff --git a/tests/com/google/common/geometry/S2RegionCovererTest.java b/tests/com/google/common/geometry/S2RegionCovererTest.java
index 51e3de4..5ff8969 100644
--- a/tests/com/google/common/geometry/S2RegionCovererTest.java
+++ b/tests/com/google/common/geometry/S2RegionCovererTest.java
@@ -74,6 +74,9 @@ public strictfp class S2RegionCovererTest extends GeometryTestCase {
     }
   }
 
+  // b/280346791 - commented in Android as this test occasionally takes a long time, probably
+  // due to an upstream bug that generates pathological test geometry cases.
+  /*
   public void testRandomCaps() {
     logger.info("TestRandomCaps");
 
@@ -115,6 +118,7 @@ public strictfp class S2RegionCovererTest extends GeometryTestCase {
       checkCovering(coverer, cap, denormalized, false);
     }
   }
+  */
 
   public void testSimpleCoverings() {
     logger.info("TestSimpleCoverings");