commit 73e385c974ddb9d8de65b0598508fc5600cdab47
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 01:05:19 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jul 07 01:05:19 2023 +0000
tree 8b51ecc8f15244d068b01ab8381b3bf679c8871d
parent 90dfcdd6c7721fbafaed275bcd20079d53a47a36
parent 13df7e03341beb36b2038368930eb082a436c010

Snap for 10447354 from 13df7e03341beb36b2038368930eb082a436c010 to mainline-cellbroadcast-release

Change-Id: I4e2afeeeeb065efdd477100d925d682c7ffc59e5

Android.bp

diff --git a/Android.bp b/Android.bp
index f1f34d7..91d16f2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,6 +41,7 @@
         "guava",
     ],
     apex_available: [
+        "//apex_available:platform",
         "com.android.geotz",
     ],
 }

tests/com/google/common/geometry/S2RegionCovererTest.java

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 @@
     }
   }
 
+  // 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 @@
       checkCovering(coverer, cap, denormalized, false);
     }
   }
+  */
 
   public void testSimpleCoverings() {
     logger.info("TestSimpleCoverings");