diff --git a/android/guava/src/com/google/common/base/Throwables.java b/android/guava/src/com/google/common/base/Throwables.java index 1f1c346e0256..73dad9790a85 100644 --- a/android/guava/src/com/google/common/base/Throwables.java +++ b/android/guava/src/com/google/common/base/Throwables.java @@ -162,7 +162,10 @@ public static void propagateIfPossible(@CheckForNull Throwable throwable) { * * @param throwable the Throwable to possibly propagate * @param declaredType the single checked exception type declared by the calling method + * @deprecated Use a combination of {@link #throwIfInstanceOf} and {@link #throwIfUnchecked}, + * which togther provide the same behavior except that they reject {@code null}. */ + @Deprecated @J2ktIncompatible @GwtIncompatible // propagateIfInstanceOf public static void propagateIfPossible( @@ -175,13 +178,14 @@ public static void propagateIfPossible( * Propagates {@code throwable} exactly as-is, if and only if it is an instance of {@link * RuntimeException}, {@link Error}, {@code declaredType1}, or {@code declaredType2}. * - *

Discouraged in favor of calling {@link #throwIfInstanceOf} and {@link - * #throwIfUnchecked}. - * * @param throwable the Throwable to possibly propagate * @param declaredType1 any checked exception type declared by the calling method * @param declaredType2 any other checked exception type declared by the calling method + * @deprecated Use a combination of two calls to {@link #throwIfInstanceOf} and one call to {@link + * #throwIfUnchecked}, which togther provide the same behavior except that they reject {@code + * null}. */ + @Deprecated @J2ktIncompatible @GwtIncompatible // propagateIfInstanceOf public static void propagateIfPossible( diff --git a/guava/src/com/google/common/base/Throwables.java b/guava/src/com/google/common/base/Throwables.java index 1f1c346e0256..73dad9790a85 100644 --- a/guava/src/com/google/common/base/Throwables.java +++ b/guava/src/com/google/common/base/Throwables.java @@ -162,7 +162,10 @@ public static void propagateIfPossible(@CheckForNull Throwable throwable) { * * @param throwable the Throwable to possibly propagate * @param declaredType the single checked exception type declared by the calling method + * @deprecated Use a combination of {@link #throwIfInstanceOf} and {@link #throwIfUnchecked}, + * which togther provide the same behavior except that they reject {@code null}. */ + @Deprecated @J2ktIncompatible @GwtIncompatible // propagateIfInstanceOf public static void propagateIfPossible( @@ -175,13 +178,14 @@ public static void propagateIfPossible( * Propagates {@code throwable} exactly as-is, if and only if it is an instance of {@link * RuntimeException}, {@link Error}, {@code declaredType1}, or {@code declaredType2}. * - *

Discouraged in favor of calling {@link #throwIfInstanceOf} and {@link - * #throwIfUnchecked}. - * * @param throwable the Throwable to possibly propagate * @param declaredType1 any checked exception type declared by the calling method * @param declaredType2 any other checked exception type declared by the calling method + * @deprecated Use a combination of two calls to {@link #throwIfInstanceOf} and one call to {@link + * #throwIfUnchecked}, which togther provide the same behavior except that they reject {@code + * null}. */ + @Deprecated @J2ktIncompatible @GwtIncompatible // propagateIfInstanceOf public static void propagateIfPossible(