From d0815d3f7b3de7cd910e362ccebdabefdf97fbd0 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 17 Jun 2024 09:02:03 -0700 Subject: [PATCH] Deprecate `Util.areEqual` in favour of `Objects.equals` `Objects.equals` has been available since API 19. PiperOrigin-RevId: 644026884 --- .../java/androidx/media3/common/util/Util.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/util/Util.java b/libraries/common/src/main/java/androidx/media3/common/util/Util.java index cf48aaac82..04cf81c16e 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/Util.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/Util.java @@ -102,6 +102,7 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; +import com.google.errorprone.annotations.InlineMe; import java.io.ByteArrayOutputStream; import java.io.Closeable; import java.io.File; @@ -475,16 +476,15 @@ public final class Util { } /** - * Tests two objects for {@link Object#equals(Object)} equality, handling the case where one or - * both may be {@code null}. - * - * @param o1 The first object. - * @param o2 The second object. - * @return {@code o1 == null ? o2 == null : o1.equals(o2)}. + * @deprecated Use {@link Objects#equals(Object, Object)} instead. */ @UnstableApi + @Deprecated + @InlineMe( + replacement = "Objects.equals(o1, o2)", + imports = {"java.util.Objects"}) public static boolean areEqual(@Nullable Object o1, @Nullable Object o2) { - return o1 == null ? o2 == null : o1.equals(o2); + return Objects.equals(o1, o2); } /**