Snap for 10453563 from 13df7e03341beb36b2038368930eb082a436c010 to mainline-adservices-releaseaml_ads_341720000aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050android14-mainline-adservices-release

Change-Id: Ie5a62a398e27f8dafede67a831a3ee0313276d01

2 files changed, 5 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index f1f34d7..91d16f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,7 @@ java_library {
         "guava",
     ],
     apex_available: [
+        "//apex_available:platform",
         "com.android.geotz",
     ],
 }
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");