commit bde86f774a1f9d9816a857ec76e05fdde1a1088a
author John Laxson <jl@revealtech.ai> Mon Apr 25 09:49:04 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 25 09:50:25 2022 -0700
tree d4e886180ae097f6fcbc4a4e3f67270dfa3b1cb8
parent fafcd5a9690e21681d0427ab6f3037fc8710a04d

Make Desugaring Classes Public

When an android application is installed via mobile-install, some uses of Throwable (such as getting the stack trace) will cause java.lang.IllegalAccessError as described in #11961.

This applies a fix as described in that thread, making the classes public.

Closes #15184.

PiperOrigin-RevId: 444296099

src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtension.java

diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtension.java b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtension.java
index 2d2925f..c19320d 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtension.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/runtime/ThrowableExtension.java
@@ -175,7 +175,7 @@
    * The strategy to desugar try-with-resources statements. A strategy handles the behavior of an
    * exception in terms of suppressed exceptions and stack trace printing.
    */
-  abstract static class AbstractDesugaringStrategy {
+  public abstract static class AbstractDesugaringStrategy {
 
     protected static final Throwable[] EMPTY_THROWABLE_ARRAY = new Throwable[0];
 
@@ -191,7 +191,7 @@
   }
 
   /** This strategy just delegates all the method calls to java.lang.Throwable. */
-  static final class ReuseDesugaringStrategy extends AbstractDesugaringStrategy {
+  public static final class ReuseDesugaringStrategy extends AbstractDesugaringStrategy {
 
     @Override
     public void addSuppressed(Throwable receiver, Throwable suppressed) {
@@ -220,7 +220,7 @@
   }
 
   /** This strategy mimics the behavior of suppressed exceptions with a map. */
-  static final class MimicDesugaringStrategy extends AbstractDesugaringStrategy {
+  public static final class MimicDesugaringStrategy extends AbstractDesugaringStrategy {
 
     static final String SUPPRESSED_PREFIX = "Suppressed: ";
     private final ConcurrentWeakIdentityHashMap map = new ConcurrentWeakIdentityHashMap();
@@ -304,7 +304,7 @@
   }
 
   /** A hash map, that is concurrent, weak-key, and identity-hashing. */
-  static final class ConcurrentWeakIdentityHashMap {
+  public static final class ConcurrentWeakIdentityHashMap {
 
     private final ConcurrentHashMap<WeakKey, List<Throwable>> map =
         new ConcurrentHashMap<>(16, 0.75f, 10);