Merge "Snap for 11400057 from fcb68273955c94ebe12fda34018935b0c25d56dc to simpleperf-release" into simpleperf-releasesimpleperf-release

1 files changed, 9 insertions, 16 deletions

diff --git a/guava/src/com/google/common/reflect/Invokable.java b/guava/src/com/google/common/reflect/Invokable.java
index 29f4a4ed9..2e2c04193 100644
--- a/guava/src/com/google/common/reflect/Invokable.java
+++ b/guava/src/com/google/common/reflect/Invokable.java
@@ -117,13 +117,14 @@ public abstract class Invokable<T, R> implements AnnotatedElement, Member {
   }
 
   /** See {@link java.lang.reflect.AccessibleObject#trySetAccessible()}. */
+  @SuppressWarnings("CatchingUnchecked") // sneaky checked exception
   public final boolean trySetAccessible() {
     // We can't call accessibleObject.trySetAccessible since that was added in Java 9 and this code
     // should work on Java 8. So we emulate it this way.
     try {
       accessibleObject.setAccessible(true);
       return true;
-    } catch (RuntimeException e) {
+    } catch (Exception e) { // sneaky checked exception
       return false;
     }
   }
@@ -341,8 +342,7 @@ public abstract class Invokable<T, R> implements AnnotatedElement, Member {
 
   abstract Type[] getGenericParameterTypes();
 
-  @SuppressWarnings({"Java7ApiChecker", "AndroidJdkLibsChecker"})
-  @IgnoreJRERequirement
+  @SuppressWarnings("Java7ApiChecker")
   abstract AnnotatedType[] getAnnotatedParameterTypes();
 
   /** This should never return a type that's not a subtype of Throwable. */
@@ -355,12 +355,9 @@ public abstract class Invokable<T, R> implements AnnotatedElement, Member {
   /**
    * Returns the {@link AnnotatedType} for the return type.
    *
-   * <p>This method will fail if run under an Android VM.
-   *
-   * @since 14.0 for guava-jre (available since 32.0.0 in guava-android)
+   * @since 14.0
    */
-  @SuppressWarnings({"Java7ApiChecker", "AndroidJdkLibsChecker"})
-  @IgnoreJRERequirement
+  @SuppressWarnings("Java7ApiChecker")
   public abstract AnnotatedType getAnnotatedReturnType();
 
   static class MethodInvokable<T> extends Invokable<T, Object> {
@@ -390,15 +387,13 @@ public abstract class Invokable<T, R> implements AnnotatedElement, Member {
     }
 
     @Override
-    @SuppressWarnings({"Java7ApiChecker", "AndroidJdkLibsChecker"})
-    @IgnoreJRERequirement
+    @SuppressWarnings("Java7ApiChecker")
     AnnotatedType[] getAnnotatedParameterTypes() {
       return method.getAnnotatedParameterTypes();
     }
 
     @Override
-    @SuppressWarnings({"Java7ApiChecker", "AndroidJdkLibsChecker", "DoNotCall"})
-    @IgnoreJRERequirement
+    @SuppressWarnings("Java7ApiChecker")
     public AnnotatedType getAnnotatedReturnType() {
       return method.getAnnotatedReturnType();
     }
@@ -481,15 +476,13 @@ public abstract class Invokable<T, R> implements AnnotatedElement, Member {
     }
 
     @Override
-    @SuppressWarnings({"Java7ApiChecker", "AndroidJdkLibsChecker"})
-    @IgnoreJRERequirement
+    @SuppressWarnings("Java7ApiChecker")
     AnnotatedType[] getAnnotatedParameterTypes() {
       return constructor.getAnnotatedParameterTypes();
     }
 
     @Override
-    @SuppressWarnings({"Java7ApiChecker", "AndroidJdkLibsChecker", "DoNotCall"})
-    @IgnoreJRERequirement
+    @SuppressWarnings("Java7ApiChecker")
     public AnnotatedType getAnnotatedReturnType() {
       return constructor.getAnnotatedReturnType();
     }