Merge nested try-catch blocks.

Fixes #6599

RELNOTES=n/a
PiperOrigin-RevId: 543735962

Author: cpovirk

android/guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java

@@ -16,6 +16,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
@@ -122,16 +123,12 @@ private static <T> T newProxy(Class<T> interfaceType, InvocationHandler handler)
     Future<T> future = executor.submit(callable);
 
     try {
-      if (amInterruptible) {
-        try {
-          return future.get(timeoutDuration, timeoutUnit);
-        } catch (InterruptedException e) {
-          future.cancel(true);
-          throw e;
-        }
-      } else {
-        return Uninterruptibles.getUninterruptibly(future, timeoutDuration, timeoutUnit);
-      }
+      return amInterruptible
+          ? future.get(timeoutDuration, timeoutUnit)
+          : getUninterruptibly(future, timeoutDuration, timeoutUnit);
+    } catch (InterruptedException e) {
+      future.cancel(true);
+      throw e;
     } catch (ExecutionException e) {
       throw throwCause(e, true /* combineStackTraces */);
     } catch (TimeoutException e) {
@@ -176,7 +173,7 @@ private static <T> T newProxy(Class<T> interfaceType, InvocationHandler handler)
     Future<T> future = executor.submit(callable);
 
     try {
-      return Uninterruptibles.getUninterruptibly(future, timeoutDuration, timeoutUnit);
+      return getUninterruptibly(future, timeoutDuration, timeoutUnit);
     } catch (TimeoutException e) {
       future.cancel(true /* mayInterruptIfRunning */);
       throw e;
@@ -216,7 +213,7 @@ public void runUninterruptiblyWithTimeout(
     Future<?> future = executor.submit(runnable);
 
     try {
-      Uninterruptibles.getUninterruptibly(future, timeoutDuration, timeoutUnit);
+      getUninterruptibly(future, timeoutDuration, timeoutUnit);
     } catch (TimeoutException e) {
       future.cancel(true /* mayInterruptIfRunning */);
       throw e;

guava/src/com/google/common/util/concurrent/SimpleTimeLimiter.java

@@ -16,6 +16,7 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.util.concurrent.Uninterruptibles.getUninterruptibly;
 
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.J2ktIncompatible;
@@ -122,16 +123,12 @@ private static <T> T newProxy(Class<T> interfaceType, InvocationHandler handler)
     Future<T> future = executor.submit(callable);
 
     try {
-      if (amInterruptible) {
-        try {
-          return future.get(timeoutDuration, timeoutUnit);
-        } catch (InterruptedException e) {
-          future.cancel(true);
-          throw e;
-        }
-      } else {
-        return Uninterruptibles.getUninterruptibly(future, timeoutDuration, timeoutUnit);
-      }
+      return amInterruptible
+          ? future.get(timeoutDuration, timeoutUnit)
+          : getUninterruptibly(future, timeoutDuration, timeoutUnit);
+    } catch (InterruptedException e) {
+      future.cancel(true);
+      throw e;
     } catch (ExecutionException e) {
       throw throwCause(e, true /* combineStackTraces */);
     } catch (TimeoutException e) {
@@ -176,7 +173,7 @@ private static <T> T newProxy(Class<T> interfaceType, InvocationHandler handler)
     Future<T> future = executor.submit(callable);
 
     try {
-      return Uninterruptibles.getUninterruptibly(future, timeoutDuration, timeoutUnit);
+      return getUninterruptibly(future, timeoutDuration, timeoutUnit);
     } catch (TimeoutException e) {
       future.cancel(true /* mayInterruptIfRunning */);
       throw e;
@@ -216,7 +213,7 @@ public void runUninterruptiblyWithTimeout(
     Future<?> future = executor.submit(runnable);
 
     try {
-      Uninterruptibles.getUninterruptibly(future, timeoutDuration, timeoutUnit);
+      getUninterruptibly(future, timeoutDuration, timeoutUnit);
     } catch (TimeoutException e) {
       future.cancel(true /* mayInterruptIfRunning */);
       throw e;